From 0fa4f162f4e42a455dbb7e7459854b9467337863 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Fri, 22 Apr 2016 14:48:25 -0400 Subject: Formatting changes --- .../bjc/dicelang/ast/nodes/ILiteralDiceNode.java | 66 +++++++++++----------- .../bjc/dicelang/ast/nodes/IntegerLiteralNode.java | 14 ++--- .../bjc/dicelang/ast/nodes/OperatorDiceNode.java | 20 +++---- 3 files changed, 50 insertions(+), 50 deletions(-) (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/nodes') diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/nodes/ILiteralDiceNode.java b/dice-lang/src/main/java/bjc/dicelang/ast/nodes/ILiteralDiceNode.java index 994a680..2105102 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/nodes/ILiteralDiceNode.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/nodes/ILiteralDiceNode.java @@ -9,39 +9,6 @@ import org.apache.commons.lang3.StringUtils; * */ public interface ILiteralDiceNode extends IDiceASTNode { - @Override - default DiceASTType getType() { - return DiceASTType.LITERAL; - } - - @Override - default boolean isOperator() { - return false; - } - - /** - * Get the type of literal this node represents - * - * @return The type of literal this node represents - */ - DiceLiteralType getLiteralType(); - - /** - * Optimize this node to a constant if possible - * - * @return This node in constant form if possible - * @see bjc.dicelang.IDiceExpression#optimize() - */ - int optimize(); - - /** - * Check if this node can be optimized to a constant - * - * @return Whether or not this node can be optimized to a constant - * @see bjc.dicelang.IDiceExpression#canOptimize() - */ - boolean canOptimize(); - /** * Check if a token represents a literal, and if so, what type * @@ -67,4 +34,37 @@ public interface ILiteralDiceNode extends IDiceASTNode { } } } + + /** + * Check if this node can be optimized to a constant + * + * @return Whether or not this node can be optimized to a constant + * @see bjc.dicelang.IDiceExpression#canOptimize() + */ + boolean canOptimize(); + + /** + * Get the type of literal this node represents + * + * @return The type of literal this node represents + */ + DiceLiteralType getLiteralType(); + + @Override + default DiceASTType getType() { + return DiceASTType.LITERAL; + } + + @Override + default boolean isOperator() { + return false; + } + + /** + * Optimize this node to a constant if possible + * + * @return This node in constant form if possible + * @see bjc.dicelang.IDiceExpression#optimize() + */ + int optimize(); } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/nodes/IntegerLiteralNode.java b/dice-lang/src/main/java/bjc/dicelang/ast/nodes/IntegerLiteralNode.java index d25adbc..3d43bb1 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/nodes/IntegerLiteralNode.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/nodes/IntegerLiteralNode.java @@ -19,6 +19,11 @@ public class IntegerLiteralNode implements ILiteralDiceNode { value = val; } + @Override + public boolean canOptimize() { + return true; + } + @Override public DiceLiteralType getLiteralType() { return DiceLiteralType.INTEGER; @@ -33,18 +38,13 @@ public class IntegerLiteralNode implements ILiteralDiceNode { return value; } - @Override - public String toString() { - return Integer.toString(value); - } - @Override public int optimize() { return value; } @Override - public boolean canOptimize() { - return true; + public String toString() { + return Integer.toString(value); } } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/nodes/OperatorDiceNode.java b/dice-lang/src/main/java/bjc/dicelang/ast/nodes/OperatorDiceNode.java index 411548a..4ba3956 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/nodes/OperatorDiceNode.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/nodes/OperatorDiceNode.java @@ -52,16 +52,6 @@ public enum OperatorDiceNode implements IDiceASTNode { */ LET(EXPRESSION); - /** - * Represents the group of operator this operator is sorted into. - * - */ - public final DiceOperatorType type; - - private OperatorDiceNode(DiceOperatorType ty) { - type = ty; - } - /** * Create a operator node from a string * @@ -99,6 +89,16 @@ public enum OperatorDiceNode implements IDiceASTNode { } } + /** + * Represents the group of operator this operator is sorted into. + * + */ + public final DiceOperatorType type; + + private OperatorDiceNode(DiceOperatorType ty) { + type = ty; + } + @Override public DiceASTType getType() { return DiceASTType.OPERATOR; -- cgit v1.2.3