mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-17 23:05:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug or two in the implementation of no_tag tags: to

Browse Source 
Estimated hours taken: 1

compiler/shapes.m:
	Fix a bug or two in the implementation of no_tag tags: to
	create the shape num for a type with a no_tag tag, use the
	type that results *after* we've substituted any type variables,
	and create the shape by recursively calling shapes__request_shape
	rather than shapes__create_shape (the latter doesn't handle
	builtin types like `int' correctly, and anyway we don't want to
	create it if it already exists).
This commit is contained in:
Fergus Henderson
1996-04-12 16:59:37 +00:00
parent 9aa364262c
commit 51078191d9
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/shapes.m
View File

@@ -306,10 +306,17 @@ shapes__create_shape_2(Type_Tab, Type, Inst, Type_Id, TypeArgs, Shape,
Hlds_Type = hlds__type_defn(_TypeVarSet, TypeParams, Hlds_Type = hlds__type_defn(_TypeVarSet, TypeParams,
du_type(Ctors0, TagVals, _), _, _) du_type(Ctors0, TagVals, _), _, _)
-> ->
term__term_list_to_var_list(TypeParams,
TypeParamVars),
map__from_corresponding_lists(TypeParamVars,
TypeArgs, TypeSubst),
shapes__apply_to_ctors(Ctors0, TypeSubst,
Ctors),
% check for a type with only one functor of arity one: % check for a type with only one functor of arity one:
% such a type will have a `no_tag' functor % such a type will have a `no_tag' functor
% (unless it is type_info/1) % (unless it is type_info/1)
( Ctors0 = [SingleCtor - [SingleArgType]], ( Ctors = [SingleCtor - [SingleArgType]],
SingleCtor \= qualified(_, "type_info"), SingleCtor \= qualified(_, "type_info"),
SingleCtor \= unqualified("type_info") SingleCtor \= unqualified("type_info")
-> ->
@@ -327,17 +334,12 @@ shapes__create_shape_2(Type_Tab, Type, Inst, Type_Id, TypeArgs, Shape,
% etc., so inst of arg is the same % etc., so inst of arg is the same
SingleArgInst = Inst SingleArgInst = Inst
), ),
shapes__create_shape(Type_Tab, shapes__request_shape_number(
SingleArgType - SingleArgInst, SingleArgType - SingleArgInst,
Shape, S_Tab0, S_Tab) Type_Tab,
S_Tab0, S_Tab, ShapeNum),
Shape = equivalent(num(ShapeNum))
; ;
term__term_list_to_var_list(TypeParams,
TypeParamVars),
map__from_corresponding_lists(TypeParamVars,
TypeArgs, TypeSubst),
shapes__apply_to_ctors(Ctors0, TypeSubst,
Ctors),
Shape = quad(A,B,C,D), Shape = quad(A,B,C,D),
shapes__create_shapeA(Type_Id, Ctors, TagVals, shapes__create_shapeA(Type_Id, Ctors, TagVals,
bit_zero, A, Type_Tab, S_Tab0, S_Tab1), bit_zero, A, Type_Tab, S_Tab0, S_Tab1),