From 1dcaddbec735cfa3ee55ad9187c661dfcfc780b8 Mon Sep 17 00:00:00 2001 From: George Karpenkov Date: Wed, 6 Jan 2016 11:07:48 +0100 Subject: [PATCH] Adding @Override declarations They are important, as they prevent miss-spelling the parent method and /or arguments name. --- src/api/java/AST.java | 6 ++++++ src/api/java/ASTDecRefQueue.java | 2 ++ src/api/java/ASTMap.java | 3 +++ src/api/java/ASTVector.java | 3 +++ src/api/java/ApplyResult.java | 3 +++ src/api/java/ApplyResultDecRefQueue.java | 2 ++ src/api/java/AstMapDecRefQueue.java | 2 ++ src/api/java/AstVectorDecRefQueue.java | 2 ++ src/api/java/BitVecNum.java | 1 + src/api/java/Expr.java | 2 ++ src/api/java/FiniteDomainNum.java | 1 + src/api/java/Fixedpoint.java | 3 +++ src/api/java/FixedpointDecRefQueue.java | 2 ++ src/api/java/FuncDecl.java | 3 +++ src/api/java/FuncInterp.java | 5 +++++ src/api/java/FuncInterpDecRefQueue.java | 2 ++ src/api/java/FuncInterpEntryDecRefQueue.java | 2 ++ src/api/java/GoalDecRefQueue.java | 2 ++ src/api/java/IntSymbol.java | 1 + src/api/java/Model.java | 3 +++ src/api/java/ModelDecRefQueue.java | 2 ++ src/api/java/Optimize.java | 11 +++++++---- src/api/java/OptimizeDecRefQueue.java | 2 ++ src/api/java/ParamDescrs.java | 3 +++ src/api/java/ParamDescrsDecRefQueue.java | 2 ++ src/api/java/Params.java | 3 +++ src/api/java/ParamsDecRefQueue.java | 2 ++ src/api/java/Pattern.java | 1 + src/api/java/Probe.java | 2 ++ src/api/java/ProbeDecRefQueue.java | 2 ++ src/api/java/RatNum.java | 1 + src/api/java/Solver.java | 3 +++ src/api/java/SolverDecRefQueue.java | 2 ++ src/api/java/Sort.java | 1 + src/api/java/StringSymbol.java | 1 + src/api/java/Symbol.java | 1 + 36 files changed, 85 insertions(+), 4 deletions(-) diff --git a/src/api/java/AST.java b/src/api/java/AST.java index 4be02ce30..7bc2a79fc 100644 --- a/src/api/java/AST.java +++ b/src/api/java/AST.java @@ -29,6 +29,7 @@ public class AST extends Z3Object implements Comparable * * @param o another AST **/ + @Override public boolean equals(Object o) { AST casted = null; @@ -56,6 +57,7 @@ public class AST extends Z3Object implements Comparable * positive if after else zero. * @throws Z3Exception on error **/ + @Override public int compareTo(AST other) { if (other == null) @@ -74,6 +76,7 @@ public class AST extends Z3Object implements Comparable * * @return A hash code **/ + @Override public int hashCode() { int r = 0; @@ -188,6 +191,7 @@ public class AST extends Z3Object implements Comparable /** * A string representation of the AST. **/ + @Override public String toString() { try @@ -217,6 +221,7 @@ public class AST extends Z3Object implements Comparable super(ctx, obj); } + @Override void incRef(long o) { // Console.WriteLine("AST IncRef()"); @@ -226,6 +231,7 @@ public class AST extends Z3Object implements Comparable super.incRef(o); } + @Override void decRef(long o) { // Console.WriteLine("AST DecRef()"); diff --git a/src/api/java/ASTDecRefQueue.java b/src/api/java/ASTDecRefQueue.java index a8ee83e57..32f6a5d0e 100644 --- a/src/api/java/ASTDecRefQueue.java +++ b/src/api/java/ASTDecRefQueue.java @@ -29,6 +29,7 @@ class ASTDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ASTDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/ASTMap.java b/src/api/java/ASTMap.java index afeb868ca..7bc485bf5 100644 --- a/src/api/java/ASTMap.java +++ b/src/api/java/ASTMap.java @@ -101,6 +101,7 @@ class ASTMap extends Z3Object /** * Retrieves a string representation of the map. **/ + @Override public String toString() { try @@ -122,12 +123,14 @@ class ASTMap extends Z3Object super(ctx, Native.mkAstMap(ctx.nCtx())); } + @Override void incRef(long o) { getContext().getASTMapDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getASTMapDRQ().add(o); diff --git a/src/api/java/ASTVector.java b/src/api/java/ASTVector.java index 5b57db9d9..ab99e2aee 100644 --- a/src/api/java/ASTVector.java +++ b/src/api/java/ASTVector.java @@ -87,6 +87,7 @@ public class ASTVector extends Z3Object /** * Retrieves a string representation of the vector. **/ + @Override public String toString() { try @@ -108,12 +109,14 @@ public class ASTVector extends Z3Object super(ctx, Native.mkAstVector(ctx.nCtx())); } + @Override void incRef(long o) { getContext().getASTVectorDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getASTVectorDRQ().add(o); diff --git a/src/api/java/ApplyResult.java b/src/api/java/ApplyResult.java index 2812efd70..84c63e966 100644 --- a/src/api/java/ApplyResult.java +++ b/src/api/java/ApplyResult.java @@ -63,6 +63,7 @@ public class ApplyResult extends Z3Object /** * A string representation of the ApplyResult. **/ + @Override public String toString() { try @@ -79,12 +80,14 @@ public class ApplyResult extends Z3Object super(ctx, obj); } + @Override void incRef(long o) { getContext().getApplyResultDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getApplyResultDRQ().add(o); diff --git a/src/api/java/ApplyResultDecRefQueue.java b/src/api/java/ApplyResultDecRefQueue.java index 4cdf312fe..63f315ecd 100644 --- a/src/api/java/ApplyResultDecRefQueue.java +++ b/src/api/java/ApplyResultDecRefQueue.java @@ -29,6 +29,7 @@ class ApplyResultDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ApplyResultDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/AstMapDecRefQueue.java b/src/api/java/AstMapDecRefQueue.java index 2106ff0c2..1598f75e7 100644 --- a/src/api/java/AstMapDecRefQueue.java +++ b/src/api/java/AstMapDecRefQueue.java @@ -29,6 +29,7 @@ class ASTMapDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ASTMapDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/AstVectorDecRefQueue.java b/src/api/java/AstVectorDecRefQueue.java index 698e9e06b..a63d808d3 100644 --- a/src/api/java/AstVectorDecRefQueue.java +++ b/src/api/java/AstVectorDecRefQueue.java @@ -29,6 +29,7 @@ class ASTVectorDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ASTVectorDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/BitVecNum.java b/src/api/java/BitVecNum.java index 08da40256..cd5e789b9 100644 --- a/src/api/java/BitVecNum.java +++ b/src/api/java/BitVecNum.java @@ -61,6 +61,7 @@ public class BitVecNum extends BitVecExpr /** * Returns a string representation of the numeral. **/ + @Override public String toString() { try diff --git a/src/api/java/Expr.java b/src/api/java/Expr.java index e03d5b1c9..b59a41e1d 100644 --- a/src/api/java/Expr.java +++ b/src/api/java/Expr.java @@ -206,6 +206,7 @@ public class Expr extends AST /** * Returns a string representation of the expression. **/ + @Override public String toString() { return super.toString(); @@ -2117,6 +2118,7 @@ public class Expr extends AST } } + @Override void checkNativeObject(long obj) { if (!Native.isApp(getContext().nCtx(), obj) && diff --git a/src/api/java/FiniteDomainNum.java b/src/api/java/FiniteDomainNum.java index 79845c700..73613e4e0 100644 --- a/src/api/java/FiniteDomainNum.java +++ b/src/api/java/FiniteDomainNum.java @@ -63,6 +63,7 @@ public class FiniteDomainNum extends FiniteDomainExpr /** * Returns a string representation of the numeral. **/ + @Override public String toString() { try diff --git a/src/api/java/Fixedpoint.java b/src/api/java/Fixedpoint.java index 0bdbfb571..a6ef9714c 100644 --- a/src/api/java/Fixedpoint.java +++ b/src/api/java/Fixedpoint.java @@ -252,6 +252,7 @@ public class Fixedpoint extends Z3Object /** * Retrieve internal string representation of fixedpoint object. **/ + @Override public String toString() { try @@ -353,12 +354,14 @@ public class Fixedpoint extends Z3Object super(ctx, Native.mkFixedpoint(ctx.nCtx())); } + @Override void incRef(long o) { getContext().getFixedpointDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getFixedpointDRQ().add(o); diff --git a/src/api/java/FixedpointDecRefQueue.java b/src/api/java/FixedpointDecRefQueue.java index da2af3a41..e65538a30 100644 --- a/src/api/java/FixedpointDecRefQueue.java +++ b/src/api/java/FixedpointDecRefQueue.java @@ -29,6 +29,7 @@ class FixedpointDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class FixedpointDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/FuncDecl.java b/src/api/java/FuncDecl.java index bc2baab91..ac72c4012 100644 --- a/src/api/java/FuncDecl.java +++ b/src/api/java/FuncDecl.java @@ -29,6 +29,7 @@ public class FuncDecl extends AST /** * Object comparison. **/ + @Override public boolean equals(Object o) { FuncDecl casted = null; @@ -58,6 +59,7 @@ public class FuncDecl extends AST /** * A string representations of the function declaration. **/ + @Override public String toString() { try @@ -72,6 +74,7 @@ public class FuncDecl extends AST /** * Returns a unique identifier for the function declaration. **/ + @Override public int getId() { return Native.getFuncDeclId(getContext().nCtx(), getNativeObject()); diff --git a/src/api/java/FuncInterp.java b/src/api/java/FuncInterp.java index 59a8a0398..fb549b3f2 100644 --- a/src/api/java/FuncInterp.java +++ b/src/api/java/FuncInterp.java @@ -70,6 +70,7 @@ public class FuncInterp extends Z3Object /** * A string representation of the function entry. **/ + @Override public String toString() { try @@ -91,12 +92,14 @@ public class FuncInterp extends Z3Object super(ctx, obj); } + @Override void incRef(long o) { getContext().getFuncEntryDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getFuncEntryDRQ().add(o); @@ -192,12 +195,14 @@ public class FuncInterp extends Z3Object super(ctx, obj); } + @Override void incRef(long o) { getContext().getFuncInterpDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getFuncInterpDRQ().add(o); diff --git a/src/api/java/FuncInterpDecRefQueue.java b/src/api/java/FuncInterpDecRefQueue.java index 56660d2f9..c888e9e3d 100644 --- a/src/api/java/FuncInterpDecRefQueue.java +++ b/src/api/java/FuncInterpDecRefQueue.java @@ -29,6 +29,7 @@ class FuncInterpDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class FuncInterpDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/FuncInterpEntryDecRefQueue.java b/src/api/java/FuncInterpEntryDecRefQueue.java index 406c0b33a..7dfdaa27d 100644 --- a/src/api/java/FuncInterpEntryDecRefQueue.java +++ b/src/api/java/FuncInterpEntryDecRefQueue.java @@ -29,6 +29,7 @@ class FuncInterpEntryDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class FuncInterpEntryDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/GoalDecRefQueue.java b/src/api/java/GoalDecRefQueue.java index dd9d69414..be921241b 100644 --- a/src/api/java/GoalDecRefQueue.java +++ b/src/api/java/GoalDecRefQueue.java @@ -29,6 +29,7 @@ class GoalDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class GoalDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/IntSymbol.java b/src/api/java/IntSymbol.java index db99e6840..fab242d28 100644 --- a/src/api/java/IntSymbol.java +++ b/src/api/java/IntSymbol.java @@ -46,6 +46,7 @@ public class IntSymbol extends Symbol super(ctx, Native.mkIntSymbol(ctx.nCtx(), i)); } + @Override void checkNativeObject(long obj) { if (Native.getSymbolKind(getContext().nCtx(), obj) != Z3_symbol_kind.Z3_INT_SYMBOL diff --git a/src/api/java/Model.java b/src/api/java/Model.java index 17e5de2a2..16613af68 100644 --- a/src/api/java/Model.java +++ b/src/api/java/Model.java @@ -282,6 +282,7 @@ public class Model extends Z3Object * * @return A string representation of the model. **/ + @Override public String toString() { try @@ -298,12 +299,14 @@ public class Model extends Z3Object super(ctx, obj); } + @Override void incRef(long o) { getContext().getModelDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getModelDRQ().add(o); diff --git a/src/api/java/ModelDecRefQueue.java b/src/api/java/ModelDecRefQueue.java index c954a1fa8..b97add310 100644 --- a/src/api/java/ModelDecRefQueue.java +++ b/src/api/java/ModelDecRefQueue.java @@ -29,6 +29,7 @@ class ModelDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ModelDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/Optimize.java b/src/api/java/Optimize.java index f12bb7e06..9d62873e2 100644 --- a/src/api/java/Optimize.java +++ b/src/api/java/Optimize.java @@ -112,8 +112,9 @@ public class Optimize extends Z3Object /** * Print a string representation of the handle. - **/ - public String toString() + **/ + @Override + public String toString() { return getValue().toString(); } @@ -237,7 +238,8 @@ public class Optimize extends Z3Object /** * Print the context to a String (SMT-LIB parseable benchmark). - **/ + **/ + @Override public String toString() { return Native.optimizeToString(getContext().nCtx(), getNativeObject()); @@ -262,13 +264,14 @@ public class Optimize extends Z3Object super(ctx, Native.mkOptimize(ctx.nCtx())); } - + @Override void incRef(long o) { getContext().getOptimizeDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getOptimizeDRQ().add(o); diff --git a/src/api/java/OptimizeDecRefQueue.java b/src/api/java/OptimizeDecRefQueue.java index c9bc251e1..795a8a399 100644 --- a/src/api/java/OptimizeDecRefQueue.java +++ b/src/api/java/OptimizeDecRefQueue.java @@ -29,6 +29,7 @@ class OptimizeDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class OptimizeDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/ParamDescrs.java b/src/api/java/ParamDescrs.java index 514c65b46..9c6fbd0dc 100644 --- a/src/api/java/ParamDescrs.java +++ b/src/api/java/ParamDescrs.java @@ -72,6 +72,7 @@ public class ParamDescrs extends Z3Object /** * Retrieves a string representation of the ParamDescrs. **/ + @Override public String toString() { try @@ -88,12 +89,14 @@ public class ParamDescrs extends Z3Object super(ctx, obj); } + @Override void incRef(long o) { getContext().getParamDescrsDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getParamDescrsDRQ().add(o); diff --git a/src/api/java/ParamDescrsDecRefQueue.java b/src/api/java/ParamDescrsDecRefQueue.java index 95a92475e..e3515bff6 100644 --- a/src/api/java/ParamDescrsDecRefQueue.java +++ b/src/api/java/ParamDescrsDecRefQueue.java @@ -29,6 +29,7 @@ class ParamDescrsDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ParamDescrsDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/Params.java b/src/api/java/Params.java index c241ac8aa..8eef253b0 100644 --- a/src/api/java/Params.java +++ b/src/api/java/Params.java @@ -112,6 +112,7 @@ public class Params extends Z3Object /** * A string representation of the parameter set. **/ + @Override public String toString() { try @@ -128,12 +129,14 @@ public class Params extends Z3Object super(ctx, Native.mkParams(ctx.nCtx())); } + @Override void incRef(long o) { getContext().getParamsDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getParamsDRQ().add(o); diff --git a/src/api/java/ParamsDecRefQueue.java b/src/api/java/ParamsDecRefQueue.java index 7b9f34c00..f989f8015 100644 --- a/src/api/java/ParamsDecRefQueue.java +++ b/src/api/java/ParamsDecRefQueue.java @@ -29,6 +29,7 @@ class ParamsDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ParamsDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/Pattern.java b/src/api/java/Pattern.java index d51315abf..eb12b6448 100644 --- a/src/api/java/Pattern.java +++ b/src/api/java/Pattern.java @@ -50,6 +50,7 @@ public class Pattern extends AST /** * A string representation of the pattern. **/ + @Override public String toString() { try diff --git a/src/api/java/Probe.java b/src/api/java/Probe.java index 625b41e09..bcaa76ce6 100644 --- a/src/api/java/Probe.java +++ b/src/api/java/Probe.java @@ -51,12 +51,14 @@ public class Probe extends Z3Object super(ctx, Native.mkProbe(ctx.nCtx(), name)); } + @Override void incRef(long o) { getContext().getProbeDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getProbeDRQ().add(o); diff --git a/src/api/java/ProbeDecRefQueue.java b/src/api/java/ProbeDecRefQueue.java index e271bd949..368bd5bba 100644 --- a/src/api/java/ProbeDecRefQueue.java +++ b/src/api/java/ProbeDecRefQueue.java @@ -29,6 +29,7 @@ class ProbeDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -40,6 +41,7 @@ class ProbeDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/RatNum.java b/src/api/java/RatNum.java index 8fd815742..f44823a2b 100644 --- a/src/api/java/RatNum.java +++ b/src/api/java/RatNum.java @@ -74,6 +74,7 @@ public class RatNum extends RealExpr /** * Returns a string representation of the numeral. **/ + @Override public String toString() { try diff --git a/src/api/java/Solver.java b/src/api/java/Solver.java index f312da051..e58b140a6 100644 --- a/src/api/java/Solver.java +++ b/src/api/java/Solver.java @@ -315,6 +315,7 @@ public class Solver extends Z3Object /** * A string representation of the solver. **/ + @Override public String toString() { try @@ -332,12 +333,14 @@ public class Solver extends Z3Object super(ctx, obj); } + @Override void incRef(long o) { getContext().getSolverDRQ().incAndClear(getContext(), o); super.incRef(o); } + @Override void decRef(long o) { getContext().getSolverDRQ().add(o); diff --git a/src/api/java/SolverDecRefQueue.java b/src/api/java/SolverDecRefQueue.java index cbe5bbc3b..f4d5fb139 100644 --- a/src/api/java/SolverDecRefQueue.java +++ b/src/api/java/SolverDecRefQueue.java @@ -26,6 +26,7 @@ class SolverDecRefQueue extends IDecRefQueue super(move_limit); } + @Override protected void incRef(Context ctx, long obj) { try @@ -37,6 +38,7 @@ class SolverDecRefQueue extends IDecRefQueue } } + @Override protected void decRef(Context ctx, long obj) { try diff --git a/src/api/java/Sort.java b/src/api/java/Sort.java index 1481a44e2..f59569132 100644 --- a/src/api/java/Sort.java +++ b/src/api/java/Sort.java @@ -30,6 +30,7 @@ public class Sort extends AST * @param o * @return **/ + @Override public boolean equals(Object o) { Sort casted = null; diff --git a/src/api/java/StringSymbol.java b/src/api/java/StringSymbol.java index efbd3a9d2..8470e1cd4 100644 --- a/src/api/java/StringSymbol.java +++ b/src/api/java/StringSymbol.java @@ -44,6 +44,7 @@ public class StringSymbol extends Symbol super(ctx, Native.mkStringSymbol(ctx.nCtx(), s)); } + @Override void checkNativeObject(long obj) { if (Native.getSymbolKind(getContext().nCtx(), obj) != Z3_symbol_kind.Z3_STRING_SYMBOL diff --git a/src/api/java/Symbol.java b/src/api/java/Symbol.java index b54474beb..b90f8d915 100644 --- a/src/api/java/Symbol.java +++ b/src/api/java/Symbol.java @@ -62,6 +62,7 @@ public class Symbol extends Z3Object /** * A string representation of the symbol. **/ + @Override public String toString() { try