mirror of
https://github.com/Z3Prover/z3
synced 2025-04-27 10:55:50 +00:00
use type constrsaints for co-variant subtying to enable .net 3.5
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner
parent
d4539b8887
commit
310c0f31a1
8 changed files with 48 additions and 48 deletions
|
|
@ -286,8 +286,8 @@ namespace Microsoft.Z3
|
|||
Contract.Ensures(Contract.Result<TupleSort>() != null);
|
||||
|
||||
CheckContextMatch(name);
|
||||
CheckContextMatch(fieldNames);
|
||||
CheckContextMatch(fieldSorts);
|
||||
CheckContextMatch<Symbol>(fieldNames);
|
||||
CheckContextMatch<Sort>(fieldSorts);
|
||||
return new TupleSort(this, name, (uint)fieldNames.Length, fieldNames, fieldSorts);
|
||||
}
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ namespace Microsoft.Z3
|
|||
Contract.Ensures(Contract.Result<EnumSort>() != null);
|
||||
|
||||
CheckContextMatch(name);
|
||||
CheckContextMatch(enumNames);
|
||||
CheckContextMatch<Symbol>(enumNames);
|
||||
return new EnumSort(this, name, enumNames);
|
||||
}
|
||||
|
||||
|
|
@ -423,7 +423,7 @@ namespace Microsoft.Z3
|
|||
Contract.Ensures(Contract.Result<DatatypeSort>() != null);
|
||||
|
||||
CheckContextMatch(name);
|
||||
CheckContextMatch(constructors);
|
||||
CheckContextMatch<Constructor>(constructors);
|
||||
return new DatatypeSort(this, name, constructors);
|
||||
}
|
||||
|
||||
|
|
@ -436,7 +436,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(constructors, c => c != null));
|
||||
Contract.Ensures(Contract.Result<DatatypeSort>() != null);
|
||||
|
||||
CheckContextMatch(constructors);
|
||||
CheckContextMatch<Constructor>(constructors);
|
||||
return new DatatypeSort(this, MkSymbol(name), constructors);
|
||||
}
|
||||
|
||||
|
|
@ -454,7 +454,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(names, name => name != null));
|
||||
Contract.Ensures(Contract.Result<DatatypeSort[]>() != null);
|
||||
|
||||
CheckContextMatch(names);
|
||||
CheckContextMatch<Symbol>(names);
|
||||
uint n = (uint)names.Length;
|
||||
ConstructorList[] cla = new ConstructorList[n];
|
||||
IntPtr[] n_constr = new IntPtr[n];
|
||||
|
|
@ -462,7 +462,7 @@ namespace Microsoft.Z3
|
|||
{
|
||||
Constructor[] constructor = c[i];
|
||||
Contract.Assume(Contract.ForAll(constructor, arr => arr != null), "Clousot does not support yet quantified formula on multidimensional arrays");
|
||||
CheckContextMatch(constructor);
|
||||
CheckContextMatch<Constructor>(constructor);
|
||||
cla[i] = new ConstructorList(this, constructor);
|
||||
n_constr[i] = cla[i].NativeObject;
|
||||
}
|
||||
|
|
@ -520,7 +520,7 @@ namespace Microsoft.Z3
|
|||
Contract.Ensures(Contract.Result<FuncDecl>() != null);
|
||||
|
||||
CheckContextMatch(name);
|
||||
CheckContextMatch(domain);
|
||||
CheckContextMatch<Sort>(domain);
|
||||
CheckContextMatch(range);
|
||||
return new FuncDecl(this, name, domain, range);
|
||||
}
|
||||
|
|
@ -551,7 +551,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(domain, d => d != null));
|
||||
Contract.Ensures(Contract.Result<FuncDecl>() != null);
|
||||
|
||||
CheckContextMatch(domain);
|
||||
CheckContextMatch<Sort>(domain);
|
||||
CheckContextMatch(range);
|
||||
return new FuncDecl(this, MkSymbol(name), domain, range);
|
||||
}
|
||||
|
|
@ -582,7 +582,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(domain, d => d != null));
|
||||
Contract.Ensures(Contract.Result<FuncDecl>() != null);
|
||||
|
||||
CheckContextMatch(domain);
|
||||
CheckContextMatch<Sort>(domain);
|
||||
CheckContextMatch(range);
|
||||
return new FuncDecl(this, prefix, domain, range);
|
||||
}
|
||||
|
|
@ -811,7 +811,7 @@ namespace Microsoft.Z3
|
|||
Contract.Ensures(Contract.Result<Expr>() != null);
|
||||
|
||||
CheckContextMatch(f);
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<Expr>(args);
|
||||
return Expr.Create(this, f, args);
|
||||
}
|
||||
|
||||
|
|
@ -884,7 +884,7 @@ namespace Microsoft.Z3
|
|||
|
||||
Contract.Ensures(Contract.Result<BoolExpr>() != null);
|
||||
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<Expr>(args);
|
||||
return new BoolExpr(this, Native.Z3_mk_distinct(nCtx, (uint)args.Length, AST.ArrayToNative(args)));
|
||||
}
|
||||
|
||||
|
|
@ -970,7 +970,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<BoolExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<BoolExpr>(t);
|
||||
return new BoolExpr(this, Native.Z3_mk_and(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -982,7 +982,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(t != null);
|
||||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<BoolExpr>() != null);
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<BoolExpr>(t);
|
||||
return new BoolExpr(this, Native.Z3_mk_and(nCtx, (uint)t.Count(), AST.EnumToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -995,7 +995,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<BoolExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<BoolExpr>(t);
|
||||
return new BoolExpr(this, Native.Z3_mk_or(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -1025,7 +1025,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<ArithExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<ArithExpr>(t);
|
||||
return (ArithExpr)Expr.Create(this, Native.Z3_mk_add(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -1051,7 +1051,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<ArithExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<ArithExpr>(t);
|
||||
return (ArithExpr)Expr.Create(this, Native.Z3_mk_mul(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -1064,7 +1064,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<ArithExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<ArithExpr>(t);
|
||||
return (ArithExpr)Expr.Create(this, Native.Z3_mk_mul(nCtx, (uint)t.Count(), AST.EnumToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -1077,7 +1077,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<ArithExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<ArithExpr>(t);
|
||||
return (ArithExpr)Expr.Create(this, Native.Z3_mk_sub(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -2205,7 +2205,7 @@ namespace Microsoft.Z3
|
|||
Contract.Ensures(Contract.Result<ArrayExpr>() != null);
|
||||
|
||||
CheckContextMatch(f);
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<ArrayExpr>(args);
|
||||
return (ArrayExpr)Expr.Create(this, Native.Z3_mk_map(nCtx, f.NativeObject, AST.ArrayLength(args), AST.ArrayToNative(args)));
|
||||
}
|
||||
|
||||
|
|
@ -2315,7 +2315,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(args != null);
|
||||
Contract.Requires(Contract.ForAll(args, a => a != null));
|
||||
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<ArrayExpr>(args);
|
||||
return (ArrayExpr)Expr.Create(this, Native.Z3_mk_set_union(nCtx, (uint)args.Length, AST.ArrayToNative(args)));
|
||||
}
|
||||
|
||||
|
|
@ -2328,7 +2328,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(args, a => a != null));
|
||||
Contract.Ensures(Contract.Result<Expr>() != null);
|
||||
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<ArrayExpr>(args);
|
||||
return (ArrayExpr)Expr.Create(this, Native.Z3_mk_set_intersect(nCtx, (uint)args.Length, AST.ArrayToNative(args)));
|
||||
}
|
||||
|
||||
|
|
@ -2429,7 +2429,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<SeqExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<SeqExpr>(t);
|
||||
return new SeqExpr(this, Native.Z3_mk_seq_concat(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -2593,7 +2593,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<ReExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<ReExpr>(t);
|
||||
return new ReExpr(this, Native.Z3_mk_re_concat(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -2606,7 +2606,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(Contract.ForAll(t, a => a != null));
|
||||
Contract.Ensures(Contract.Result<ReExpr>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<ReExpr>(t);
|
||||
return new ReExpr(this, Native.Z3_mk_re_union(nCtx, (uint)t.Length, AST.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -2621,7 +2621,7 @@ namespace Microsoft.Z3
|
|||
{
|
||||
Contract.Requires(args != null);
|
||||
Contract.Requires(Contract.Result<BoolExpr[]>() != null);
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<BoolExpr>(args);
|
||||
return new BoolExpr(this, Native.Z3_mk_atmost(nCtx, (uint) args.Length,
|
||||
AST.ArrayToNative(args), k));
|
||||
}
|
||||
|
|
@ -2635,7 +2635,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(coeffs != null);
|
||||
Contract.Requires(args.Length == coeffs.Length);
|
||||
Contract.Requires(Contract.Result<BoolExpr[]>() != null);
|
||||
CheckContextMatch(args);
|
||||
CheckContextMatch<BoolExpr>(args);
|
||||
return new BoolExpr(this, Native.Z3_mk_pble(nCtx, (uint) args.Length,
|
||||
AST.ArrayToNative(args),
|
||||
coeffs, k));
|
||||
|
|
@ -3386,7 +3386,7 @@ namespace Microsoft.Z3
|
|||
|
||||
CheckContextMatch(t1);
|
||||
CheckContextMatch(t2);
|
||||
CheckContextMatch(ts);
|
||||
CheckContextMatch<Tactic>(ts);
|
||||
|
||||
IntPtr last = IntPtr.Zero;
|
||||
if (ts != null && ts.Length > 0)
|
||||
|
|
@ -3577,7 +3577,7 @@ namespace Microsoft.Z3
|
|||
Contract.Requires(t == null || Contract.ForAll(t, tactic => tactic != null));
|
||||
Contract.Ensures(Contract.Result<Tactic>() != null);
|
||||
|
||||
CheckContextMatch(t);
|
||||
CheckContextMatch<Tactic>(t);
|
||||
return new Tactic(this, Native.Z3_tactic_par_or(nCtx, Tactic.ArrayLength(t), Tactic.ArrayToNative(t)));
|
||||
}
|
||||
|
||||
|
|
@ -4810,7 +4810,7 @@ namespace Microsoft.Z3
|
|||
}
|
||||
|
||||
[Pure]
|
||||
internal void CheckContextMatch(IEnumerable<Z3Object> arr)
|
||||
internal void CheckContextMatch<T>(IEnumerable<T> arr) where T : Z3Object
|
||||
{
|
||||
Contract.Requires(arr == null || Contract.ForAll(arr, a => a != null));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue