diff options
| author | student <student@localhost> | 2018-03-05 16:48:38 -0500 |
|---|---|---|
| committer | student <student@localhost> | 2018-03-05 16:48:38 -0500 |
| commit | 806cba069576e48477d4660a019a49c405cb0195 (patch) | |
| tree | c1e718b18e660c02a12b5a466a222daf8a435bf4 /dice/src/main/java/bjc | |
| parent | f9d9bd4bbf7dd6a297e1daf5ee7b4263d706d9cd (diff) | |
Update
Diffstat (limited to 'dice/src/main/java/bjc')
3 files changed, 46 insertions, 13 deletions
diff --git a/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java b/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java index a946ea0..1b129c0 100644 --- a/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java +++ b/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java @@ -13,5 +13,10 @@ public interface DiceExpression { */ public String value(); + /** + * Check if the expression is a list or not. + * + * @return Whether or not the expression is a list. + */ public boolean isList(); } diff --git a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java index 33c1e51..a642857 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java +++ b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java @@ -2,6 +2,12 @@ package bjc.dicelang.dice; import java.util.Arrays; +/** + * Represents a list dice expression. + * + * @author student + * + */ public class ListDiceExpression implements DiceExpression { /** The list value in this expression, if there is one. */ @@ -11,7 +17,7 @@ public class ListDiceExpression implements DiceExpression { * Create a list die expression. * * @param lst - * The list value of this expression. + * The list value of this expression. */ public ListDiceExpression(final DieList lst) { list = lst; @@ -42,13 +48,18 @@ public class ListDiceExpression implements DiceExpression { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; ListDiceExpression other = (ListDiceExpression) obj; - if(list == null) { - if(other.list != null) return false; - } else if(!list.equals(other.list)) return false; + if (list == null) { + if (other.list != null) + return false; + } else if (!list.equals(other.list)) + return false; return true; } } diff --git a/dice/src/main/java/bjc/dicelang/dice/ScalarDiceExpression.java b/dice/src/main/java/bjc/dicelang/dice/ScalarDiceExpression.java index 5f57979..5f71d35 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ScalarDiceExpression.java +++ b/dice/src/main/java/bjc/dicelang/dice/ScalarDiceExpression.java @@ -1,11 +1,23 @@ package bjc.dicelang.dice; +/** + * Represents a scalar dice expression. + * + * @author student + * + */ public class ScalarDiceExpression implements DiceExpression { /** * The scalar value in this expression, if there is one. */ public Die scalar; + /** + * Create a new scalar dice expression. + * + * @param scal + * The value of the expression. + */ public ScalarDiceExpression(Die scal) { scalar = scal; } @@ -25,13 +37,18 @@ public class ScalarDiceExpression implements DiceExpression { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; ScalarDiceExpression other = (ScalarDiceExpression) obj; - if(scalar == null) { - if(other.scalar != null) return false; - } else if(!scalar.equals(other.scalar)) return false; + if (scalar == null) { + if (other.scalar != null) + return false; + } else if (!scalar.equals(other.scalar)) + return false; return true; } |
