mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-28 00:48:45 +00:00
Code Activity

Java type generics (#4832)

Browse source 
* Generify, needs some testing and review

* Remove unnecessary change

* Whoops, ? capture that type

* Misread the docs, whoops

* More permissible arithmetic operations

* Implement believed Optimize generics

* Missed a few generics

* More permissible expr for arrays in parameters

* More permissible expr for bitvecs in parameters

* More permissible expr for bools in parameters

* More permissible expr for fps in parameters

* More permissible expr for fprms in parameters

* More permissible expr for ints in parameters

* More permissible expr for reals in parameters

* Undo breaking name conflict due to type erasure; see notes

* Whoops, fix typing of ReExpr

* Sort corrections for Re, Seq

* More permissible expr for regular expressions in parameters

* Fix name conflict between sequences and regular expressions; see notes

* Minor typo, big implications!

* Make Constructor consistent, associate captured types with other unknown capture types for datatype consistency

* More expressive; outputs of multiple datatype definitions are only known to be sort, not capture, and Constructor.of should make a capture

* Be less dumb and just type it a little differently

* Update examples, make sure to type Expr and FuncDecl sort returns

* General fixups

* Downgrade java version, make it only for the generic support, remove var and Expr[]::new construction

* Turns out Java 8 hadn't figured out how to do stream generics yet. Didn't even show up in my IDE, weird
This commit is contained in:
Addison Crump 2020-11-30 12:04:54 -06:00 • committed by GitHub
parent bb24b3f2be
commit 3bca1fbcd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 2724 additions and 588 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/api/java/ArraySort.java
View file

@ -20,7 +20,8 @@ package com.microsoft.z3;
/**
* Array sorts.
**/
public class ArraySort extends Sort
@SuppressWarnings("unchecked")
public class ArraySort<D extends Sort, R extends Sort> extends Sort
{
/**
* The domain of the array sort.
@ -28,9 +29,9 @@ public class ArraySort extends Sort
* @throws Z3Exception on error
* @return a sort
**/
public Sort getDomain()
public D getDomain()
{
return Sort.create(getContext(),
return (D) Sort.create(getContext(),
Native.getArraySortDomain(getContext().nCtx(), getNativeObject()));
}
@ -40,9 +41,9 @@ public class ArraySort extends Sort
* @throws Z3Exception on error
* @return a sort
**/
public Sort getRange()
public R getRange()
{
return Sort.create(getContext(),
return (R) Sort.create(getContext(),
Native.getArraySortRange(getContext().nCtx(), getNativeObject()));
}
@ -51,13 +52,13 @@ public class ArraySort extends Sort
super(ctx, obj);
}
ArraySort(Context ctx, Sort domain, Sort range)
ArraySort(Context ctx, D domain, R range)
{
super(ctx, Native.mkArraySort(ctx.nCtx(), domain.getNativeObject(),
range.getNativeObject()));
}
ArraySort(Context ctx, Sort[] domains, Sort range)
ArraySort(Context ctx, Sort[] domains, R range)
{
super(ctx, Native.mkArraySortN(ctx.nCtx(), domains.length, AST.arrayToNative(domains),
range.getNativeObject()));