From 12f3c4d7f530265c966bc72764d17e08a47aa4c0 Mon Sep 17 00:00:00 2001 From: Ally Donaldson Date: Mon, 22 Jul 2013 21:17:07 +0100 Subject: Started to remove ...Seq classes --- Source/VCExpr/TypeErasure.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Source/VCExpr/TypeErasure.cs') diff --git a/Source/VCExpr/TypeErasure.cs b/Source/VCExpr/TypeErasure.cs index e6384e67..f7860169 100644 --- a/Source/VCExpr/TypeErasure.cs +++ b/Source/VCExpr/TypeErasure.cs @@ -31,7 +31,7 @@ namespace Microsoft.Boogie.TypeErasure { Contract.Requires(Contract.ForAll(0, types.Length, i => types[i] != null)); Contract.Ensures(Contract.Result() != null); - VariableSeq args = new VariableSeq(); + List args = new List(); for (int i = 0; i < types.Length - 1; ++i) args.Add(new Formal(Token.NoToken, new TypedIdent(Token.NoToken, "arg" + i, cce.NonNull(types[i])), @@ -511,12 +511,12 @@ namespace Microsoft.Boogie.TypeErasure { TypeCtorDecl/*!*/ uDecl = new TypeCtorDecl(Token.NoToken, "U", 0); UDecl = uDecl; - Type/*!*/ u = new CtorType(Token.NoToken, uDecl, new TypeSeq()); + Type/*!*/ u = new CtorType(Token.NoToken, uDecl, new List()); U = u; TypeCtorDecl/*!*/ tDecl = new TypeCtorDecl(Token.NoToken, "T", 0); TDecl = tDecl; - Type/*!*/ t = new CtorType(Token.NoToken, tDecl, new TypeSeq()); + Type/*!*/ t = new CtorType(Token.NoToken, tDecl, new List()); T = t; Ctor = HelperFuns.BoogieFunction("Ctor", t, Type.Int); @@ -940,14 +940,14 @@ namespace Microsoft.Boogie.TypeErasure { /////////////////////////////////////////////////////////////////////////// - public Function Select(MapType rawType, out TypeSeq instantiations) { + public Function Select(MapType rawType, out List instantiations) { Contract.Requires((rawType != null)); Contract.Ensures(Contract.ValueAtReturn(out instantiations) != null); Contract.Ensures(Contract.Result() != null); return AbstractAndGetRepresentation(rawType, out instantiations).Select; } - public Function Store(MapType rawType, out TypeSeq instantiations) { + public Function Store(MapType rawType, out List instantiations) { Contract.Requires((rawType != null)); Contract.Ensures(Contract.ValueAtReturn(out instantiations) != null); Contract.Ensures(Contract.Result() != null); @@ -955,10 +955,10 @@ namespace Microsoft.Boogie.TypeErasure { } private MapTypeClassRepresentation - AbstractAndGetRepresentation(MapType rawType, out TypeSeq instantiations) { + AbstractAndGetRepresentation(MapType rawType, out List instantiations) { Contract.Requires((rawType != null)); Contract.Ensures(Contract.ValueAtReturn(out instantiations) != null); - instantiations = new TypeSeq(); + instantiations = new List(); MapType/*!*/ abstraction = ThinOutMapType(rawType, instantiations); return GetClassRepresentation(abstraction); } @@ -966,7 +966,7 @@ namespace Microsoft.Boogie.TypeErasure { public CtorType AbstractMapType(MapType rawType) { Contract.Requires(rawType != null); Contract.Ensures(Contract.Result() != null); - TypeSeq/*!*/ instantiations = new TypeSeq(); + List/*!*/ instantiations = new List(); MapType/*!*/ abstraction = ThinOutMapType(rawType, instantiations); MapTypeClassRepresentation repr = GetClassRepresentation(abstraction); @@ -975,11 +975,11 @@ namespace Microsoft.Boogie.TypeErasure { } // TODO: cache the result of this operation - protected MapType ThinOutMapType(MapType rawType, TypeSeq instantiations) { + protected MapType ThinOutMapType(MapType rawType, List instantiations) { Contract.Requires(instantiations != null); Contract.Requires(rawType != null); Contract.Ensures(Contract.Result() != null); - TypeSeq/*!*/ newArguments = new TypeSeq(); + List/*!*/ newArguments = new List(); foreach (Type/*!*/ subtype in rawType.Arguments) { Contract.Assert(subtype != null); newArguments.Add(ThinOutType(subtype, rawType.TypeParameters, @@ -991,7 +991,7 @@ namespace Microsoft.Boogie.TypeErasure { } // the instantiations of inserted type variables, the order corresponds to the order in which "AbstractionVariable(int)" delivers variables - private Type/*!*/ ThinOutType(Type rawType, TypeVariableSeq boundTypeParams, TypeSeq instantiations) { + private Type/*!*/ ThinOutType(Type rawType, TypeVariableSeq boundTypeParams, List instantiations) { Contract.Requires(instantiations != null); Contract.Requires(boundTypeParams != null); Contract.Requires(rawType != null); @@ -1027,7 +1027,7 @@ namespace Microsoft.Boogie.TypeErasure { // // traverse the subtypes CtorType/*!*/ rawCtorType = rawType.AsCtor; - TypeSeq/*!*/ newArguments = new TypeSeq(); + List/*!*/ newArguments = new List(); foreach (Type/*!*/ subtype in rawCtorType.Arguments) { Contract.Assert(subtype != null); newArguments.Add(ThinOutType(subtype, boundTypeParams, -- cgit v1.2.3