From a9456fa826e083d305110242c608dbabf9e69d60 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 24 Aug 2015 14:52:32 +0000 Subject: [PATCH] Code tidy. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10564 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/parser/ast/ExpressionBinaryOp.java | 21 ++++------------ prism/src/parser/ast/ExpressionConstant.java | 21 ++++------------ prism/src/parser/ast/ExpressionExists.java | 21 ++++------------ prism/src/parser/ast/ExpressionFilter.java | 24 +++++++------------ prism/src/parser/ast/ExpressionForAll.java | 21 ++++------------ prism/src/parser/ast/ExpressionFormula.java | 21 ++++------------ prism/src/parser/ast/ExpressionFunc.java | 21 ++++------------ prism/src/parser/ast/ExpressionITE.java | 21 ++++------------ prism/src/parser/ast/ExpressionIdent.java | 21 ++++------------ prism/src/parser/ast/ExpressionLabel.java | 21 ++++------------ prism/src/parser/ast/ExpressionLiteral.java | 21 ++++------------ prism/src/parser/ast/ExpressionProb.java | 25 +++++--------------- prism/src/parser/ast/ExpressionProp.java | 21 ++++------------ prism/src/parser/ast/ExpressionReward.java | 25 +++++--------------- prism/src/parser/ast/ExpressionSS.java | 25 +++++--------------- prism/src/parser/ast/ExpressionTemporal.java | 21 ++++------------ prism/src/parser/ast/ExpressionUnaryOp.java | 21 ++++------------ prism/src/parser/ast/ExpressionVar.java | 21 ++++------------ 18 files changed, 96 insertions(+), 297 deletions(-) diff --git a/prism/src/parser/ast/ExpressionBinaryOp.java b/prism/src/parser/ast/ExpressionBinaryOp.java index 50ce599d..02cc52bb 100644 --- a/prism/src/parser/ast/ExpressionBinaryOp.java +++ b/prism/src/parser/ast/ExpressionBinaryOp.java @@ -115,9 +115,7 @@ public class ExpressionBinaryOp extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return operand1.isConstant() && operand2.isConstant(); @@ -129,10 +127,7 @@ public class ExpressionBinaryOp extends Expression return operand1.isProposition() && operand2.isProposition(); } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { switch (op) { @@ -212,25 +207,19 @@ public class ExpressionBinaryOp extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return operand1 + opSymbols[op] + operand2; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionBinaryOp expr = new ExpressionBinaryOp(op, operand1.deepCopy(), operand2.deepCopy()); diff --git a/prism/src/parser/ast/ExpressionConstant.java b/prism/src/parser/ast/ExpressionConstant.java index a586dd65..820dbe52 100644 --- a/prism/src/parser/ast/ExpressionConstant.java +++ b/prism/src/parser/ast/ExpressionConstant.java @@ -63,9 +63,7 @@ public class ExpressionConstant extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return true; @@ -77,10 +75,7 @@ public class ExpressionConstant extends Expression return true; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { Object res = ec.getConstantValue(name); @@ -97,25 +92,19 @@ public class ExpressionConstant extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return name; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { Expression ret = new ExpressionConstant(name, type); diff --git a/prism/src/parser/ast/ExpressionExists.java b/prism/src/parser/ast/ExpressionExists.java index 0875a972..ebdc22c9 100644 --- a/prism/src/parser/ast/ExpressionExists.java +++ b/prism/src/parser/ast/ExpressionExists.java @@ -61,9 +61,7 @@ public class ExpressionExists extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -75,10 +73,7 @@ public class ExpressionExists extends Expression return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate an E operator without a model"); @@ -92,17 +87,13 @@ public class ExpressionExists extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -112,9 +103,7 @@ public class ExpressionExists extends Expression return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionExists expr = new ExpressionExists(expression.deepCopy()); diff --git a/prism/src/parser/ast/ExpressionFilter.java b/prism/src/parser/ast/ExpressionFilter.java index 58b3a4b1..f963c7fd 100644 --- a/prism/src/parser/ast/ExpressionFilter.java +++ b/prism/src/parser/ast/ExpressionFilter.java @@ -184,9 +184,7 @@ public class ExpressionFilter extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { // Note: In some sense, ExpressionFilters are (often) constant since they return the same @@ -201,15 +199,13 @@ public class ExpressionFilter extends Expression return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate a filter without a model"); } + @Override public boolean returnsSingleValue() { // Most filters return a single value, but there are some exceptions... @@ -223,17 +219,13 @@ public class ExpressionFilter extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -246,9 +238,7 @@ public class ExpressionFilter extends Expression return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionFilter e; @@ -261,6 +251,8 @@ public class ExpressionFilter extends Expression return e; } + // Utility methods + /** * Wrap a "default" ExpressionFilter around an Expression representing a property to be model checked, * in order to pick out a single value (the final result of model checking) from a vector of values for all states. diff --git a/prism/src/parser/ast/ExpressionForAll.java b/prism/src/parser/ast/ExpressionForAll.java index 77871998..d2bd7833 100644 --- a/prism/src/parser/ast/ExpressionForAll.java +++ b/prism/src/parser/ast/ExpressionForAll.java @@ -61,9 +61,7 @@ public class ExpressionForAll extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -75,10 +73,7 @@ public class ExpressionForAll extends Expression return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate an E operator without a model"); @@ -92,17 +87,13 @@ public class ExpressionForAll extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -112,9 +103,7 @@ public class ExpressionForAll extends Expression return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionForAll expr = new ExpressionForAll(expression.deepCopy()); diff --git a/prism/src/parser/ast/ExpressionFormula.java b/prism/src/parser/ast/ExpressionFormula.java index 3d2ba45f..7791b804 100644 --- a/prism/src/parser/ast/ExpressionFormula.java +++ b/prism/src/parser/ast/ExpressionFormula.java @@ -73,9 +73,7 @@ public class ExpressionFormula extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { // Unless defined, don't know so err on the side of caution @@ -89,10 +87,7 @@ public class ExpressionFormula extends Expression return definition == null ? false : definition.isProposition(); } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { // Should only be called (if at all) after definition has been set @@ -111,25 +106,19 @@ public class ExpressionFormula extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return name; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionFormula ret = new ExpressionFormula(name); diff --git a/prism/src/parser/ast/ExpressionFunc.java b/prism/src/parser/ast/ExpressionFunc.java index c3c2fa3e..1f3f6bdb 100644 --- a/prism/src/parser/ast/ExpressionFunc.java +++ b/prism/src/parser/ast/ExpressionFunc.java @@ -144,9 +144,7 @@ public class ExpressionFunc extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { int i, n; @@ -170,10 +168,7 @@ public class ExpressionFunc extends Expression return true; } - /** - * Evaluate this expression, return result. Note: assumes that type checking - * has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { switch (code) { @@ -362,17 +357,13 @@ public class ExpressionFunc extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { int i, n; @@ -396,9 +387,7 @@ public class ExpressionFunc extends Expression return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { int i, n; diff --git a/prism/src/parser/ast/ExpressionITE.java b/prism/src/parser/ast/ExpressionITE.java index cc4380db..de5d2ee8 100644 --- a/prism/src/parser/ast/ExpressionITE.java +++ b/prism/src/parser/ast/ExpressionITE.java @@ -82,9 +82,7 @@ public class ExpressionITE extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return operand1.isConstant() && operand2.isConstant() && operand3.isConstant(); @@ -96,10 +94,7 @@ public class ExpressionITE extends Expression return operand1.isProposition() && operand2.isProposition() && operand3.isProposition(); } - /** - * Evaluate this expression, return result. Note: assumes that type checking - * has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { return operand1.evaluateBoolean(ec) ? operand2.evaluate(ec) : operand3.evaluate(ec); @@ -113,25 +108,19 @@ public class ExpressionITE extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return operand1 + " ? " + operand2 + " : " + operand3; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionITE expr = new ExpressionITE(operand1.deepCopy(), operand2.deepCopy(), operand3.deepCopy()); diff --git a/prism/src/parser/ast/ExpressionIdent.java b/prism/src/parser/ast/ExpressionIdent.java index adae7c37..b43bc6bd 100644 --- a/prism/src/parser/ast/ExpressionIdent.java +++ b/prism/src/parser/ast/ExpressionIdent.java @@ -61,9 +61,7 @@ public class ExpressionIdent extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { // Don't know - err on the side of caution @@ -77,10 +75,7 @@ public class ExpressionIdent extends Expression return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { // This should never be called. @@ -97,25 +92,19 @@ public class ExpressionIdent extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return name; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionIdent expr = new ExpressionIdent(name); diff --git a/prism/src/parser/ast/ExpressionLabel.java b/prism/src/parser/ast/ExpressionLabel.java index e2c49d03..299e13d3 100644 --- a/prism/src/parser/ast/ExpressionLabel.java +++ b/prism/src/parser/ast/ExpressionLabel.java @@ -50,9 +50,7 @@ public class ExpressionLabel extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { // Don't know - err on the side of caution @@ -65,10 +63,7 @@ public class ExpressionLabel extends Expression return true; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate labels", this); @@ -82,25 +77,19 @@ public class ExpressionLabel extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return "\"" + name + "\""; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionLabel expr = new ExpressionLabel(name); diff --git a/prism/src/parser/ast/ExpressionLiteral.java b/prism/src/parser/ast/ExpressionLiteral.java index e5815b35..5e3ed2de 100644 --- a/prism/src/parser/ast/ExpressionLiteral.java +++ b/prism/src/parser/ast/ExpressionLiteral.java @@ -76,9 +76,7 @@ public class ExpressionLiteral extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return true; @@ -90,10 +88,7 @@ public class ExpressionLiteral extends Expression return true; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { return value; @@ -107,25 +102,19 @@ public class ExpressionLiteral extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return string; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { Expression expr = new ExpressionLiteral(type, value, string); diff --git a/prism/src/parser/ast/ExpressionProb.java b/prism/src/parser/ast/ExpressionProb.java index acc836d1..2224d157 100644 --- a/prism/src/parser/ast/ExpressionProb.java +++ b/prism/src/parser/ast/ExpressionProb.java @@ -94,9 +94,7 @@ public class ExpressionProb extends ExpressionQuant // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -108,18 +106,13 @@ public class ExpressionProb extends ExpressionQuant return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate a P operator without a model"); } - /** - * Get "name" of the result of this expression (used for y-axis of any graphs plotted) - */ + @Override public String getResultName() { if (getBound() != null) @@ -140,17 +133,13 @@ public class ExpressionProb extends ExpressionQuant // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -165,9 +154,7 @@ public class ExpressionProb extends ExpressionQuant return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionProb expr = new ExpressionProb(); diff --git a/prism/src/parser/ast/ExpressionProp.java b/prism/src/parser/ast/ExpressionProp.java index 2d22069e..d3e11037 100644 --- a/prism/src/parser/ast/ExpressionProp.java +++ b/prism/src/parser/ast/ExpressionProp.java @@ -53,9 +53,7 @@ public class ExpressionProp extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { // Don't know - err on the side of caution @@ -69,10 +67,7 @@ public class ExpressionProp extends Expression return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate property references", this); @@ -86,25 +81,19 @@ public class ExpressionProp extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return "\"" + name + "\""; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionProp expr = new ExpressionProp(name); diff --git a/prism/src/parser/ast/ExpressionReward.java b/prism/src/parser/ast/ExpressionReward.java index d5a0bd79..052acb25 100644 --- a/prism/src/parser/ast/ExpressionReward.java +++ b/prism/src/parser/ast/ExpressionReward.java @@ -166,9 +166,7 @@ public class ExpressionReward extends ExpressionQuant // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -180,18 +178,13 @@ public class ExpressionReward extends ExpressionQuant return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate an R operator without a model"); } - /** - * Get "name" of the result of this expression (used for y-axis of any graphs plotted) - */ + @Override public String getResultName() { // For R=? properties, use name of reward structure where applicable @@ -226,17 +219,13 @@ public class ExpressionReward extends ExpressionQuant // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -260,9 +249,7 @@ public class ExpressionReward extends ExpressionQuant return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionReward expr = new ExpressionReward(); diff --git a/prism/src/parser/ast/ExpressionSS.java b/prism/src/parser/ast/ExpressionSS.java index b6b05ea5..280fd860 100644 --- a/prism/src/parser/ast/ExpressionSS.java +++ b/prism/src/parser/ast/ExpressionSS.java @@ -87,9 +87,7 @@ public class ExpressionSS extends ExpressionQuant // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -101,18 +99,13 @@ public class ExpressionSS extends ExpressionQuant return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate an S operator without a model"); } - /** - * Get "name" of the result of this expression (used for y-axis of any graphs plotted) - */ + @Override public String getResultName() { return (getBound() == null) ? "Probability" : "Result"; @@ -126,17 +119,13 @@ public class ExpressionSS extends ExpressionQuant // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -150,9 +139,7 @@ public class ExpressionSS extends ExpressionQuant return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionSS expr = new ExpressionSS(); diff --git a/prism/src/parser/ast/ExpressionTemporal.java b/prism/src/parser/ast/ExpressionTemporal.java index 4aaeb514..6cfa3030 100644 --- a/prism/src/parser/ast/ExpressionTemporal.java +++ b/prism/src/parser/ast/ExpressionTemporal.java @@ -205,9 +205,7 @@ public class ExpressionTemporal extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -219,10 +217,7 @@ public class ExpressionTemporal extends Expression return false; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { throw new PrismLangException("Cannot evaluate a temporal operator without a path"); @@ -236,17 +231,13 @@ public class ExpressionTemporal extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { String s = ""; @@ -275,9 +266,7 @@ public class ExpressionTemporal extends Expression return s; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionTemporal expr = new ExpressionTemporal(); diff --git a/prism/src/parser/ast/ExpressionUnaryOp.java b/prism/src/parser/ast/ExpressionUnaryOp.java index 7b3d89de..4a2f0bbe 100644 --- a/prism/src/parser/ast/ExpressionUnaryOp.java +++ b/prism/src/parser/ast/ExpressionUnaryOp.java @@ -88,9 +88,7 @@ public class ExpressionUnaryOp extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return operand.isConstant(); @@ -102,10 +100,7 @@ public class ExpressionUnaryOp extends Expression return operand.isProposition(); } - /** - * Evaluate this expression, return result. Note: assumes that type checking - * has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { switch (op) { @@ -131,17 +126,13 @@ public class ExpressionUnaryOp extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { if (op == PARENTH) @@ -150,9 +141,7 @@ public class ExpressionUnaryOp extends Expression return opSymbols[op] + operand; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionUnaryOp expr = new ExpressionUnaryOp(op, operand.deepCopy()); diff --git a/prism/src/parser/ast/ExpressionVar.java b/prism/src/parser/ast/ExpressionVar.java index d2e6b276..d6e2edcc 100644 --- a/prism/src/parser/ast/ExpressionVar.java +++ b/prism/src/parser/ast/ExpressionVar.java @@ -73,9 +73,7 @@ public class ExpressionVar extends Expression // Methods required for Expression: - /** - * Is this expression constant? - */ + @Override public boolean isConstant() { return false; @@ -87,10 +85,7 @@ public class ExpressionVar extends Expression return true; } - /** - * Evaluate this expression, return result. - * Note: assumes that type checking has been done already. - */ + @Override public Object evaluate(EvaluateContext ec) throws PrismLangException { Object res = ec.getVarValue(name, index); @@ -107,25 +102,19 @@ public class ExpressionVar extends Expression // Methods required for ASTElement: - /** - * Visitor method. - */ + @Override public Object accept(ASTVisitor v) throws PrismLangException { return v.visit(this); } - /** - * Convert to string. - */ + @Override public String toString() { return name; } - /** - * Perform a deep copy. - */ + @Override public Expression deepCopy() { ExpressionVar expr = new ExpressionVar(name, type);