mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-01-15 15:16:15 +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

20
src/api/java/Constructor.java
View file

@ -20,7 +20,7 @@ package com.microsoft.z3;
/**
* Constructors are used for datatype sorts.
**/
public class Constructor extends Z3Object {
public class Constructor<R> extends Z3Object {
private final int n;
Constructor(Context ctx, int n, long nativeObj) {
@ -44,13 +44,13 @@ public class Constructor extends Z3Object {
* @throws Z3Exception
* @throws Z3Exception on error
**/
public FuncDecl ConstructorDecl()
public FuncDecl<DatatypeSort<R>> ConstructorDecl()
{
Native.LongPtr constructor = new Native.LongPtr();
Native.LongPtr tester = new Native.LongPtr();
long[] accessors = new long[n];
Native.queryConstructor(getContext().nCtx(), getNativeObject(), n, constructor, tester, accessors);
return new FuncDecl(getContext(), constructor.value);
return new FuncDecl<>(getContext(), constructor.value);
}
/**
@ -58,13 +58,13 @@ public class Constructor extends Z3Object {
* @throws Z3Exception
* @throws Z3Exception on error
**/
public FuncDecl getTesterDecl()
public FuncDecl<BoolSort> getTesterDecl()
{
Native.LongPtr constructor = new Native.LongPtr();
Native.LongPtr tester = new Native.LongPtr();
long[] accessors = new long[n];
Native.queryConstructor(getContext().nCtx(), getNativeObject(), n, constructor, tester, accessors);
return new FuncDecl(getContext(), tester.value);
return new FuncDecl<>(getContext(), tester.value);
}
/**
@ -72,15 +72,15 @@ public class Constructor extends Z3Object {
* @throws Z3Exception
* @throws Z3Exception on error
**/
public FuncDecl[] getAccessorDecls()
public FuncDecl<?>[] getAccessorDecls()
{
Native.LongPtr constructor = new Native.LongPtr();
Native.LongPtr tester = new Native.LongPtr();
long[] accessors = new long[n];
Native.queryConstructor(getContext().nCtx(), getNativeObject(), n, constructor, tester, accessors);
FuncDecl[] t = new FuncDecl[n];
FuncDecl<?>[] t = new FuncDecl[n];
for (int i = 0; i < n; i++)
t[i] = new FuncDecl(getContext(), accessors[i]);
t[i] = new FuncDecl<>(getContext(), accessors[i]);
return t;
}
@ -94,7 +94,7 @@ public class Constructor extends Z3Object {
getContext().getConstructorDRQ().storeReference(getContext(), this);
}
static Constructor of(Context ctx, Symbol name, Symbol recognizer,
static <R> Constructor<R> of(Context ctx, Symbol name, Symbol recognizer,
Symbol[] fieldNames, Sort[] sorts, int[] sortRefs) {
int n = AST.arrayLength(fieldNames);
@ -111,7 +111,7 @@ public class Constructor extends Z3Object {
long nativeObj = Native.mkConstructor(ctx.nCtx(), name.getNativeObject(),
recognizer.getNativeObject(), n, Symbol.arrayToNative(fieldNames),
Sort.arrayToNative(sorts), sortRefs);
return new Constructor(ctx, n, nativeObj);
return new Constructor<>(ctx, n, nativeObj);
}
}