(feat) refactor lexer

killme2008 · killme2008 · commit 7b115738d83f · 2016-09-25T18:10:09.000+08:00
diff --git a/src/main/java/com/googlecode/aviator/lexer/ExpressionLexer.java b/src/main/java/com/googlecode/aviator/lexer/ExpressionLexer.java
@@ -20,6 +20,7 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.MathContext;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 import java.util.Stack;
@@ -83,7 +84,7 @@ public void prevChar() {
     }
 
     static final char[] VALID_HEX_CHAR = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'a', 'B', 'b', 'C',
-                                           'c', 'D', 'd', 'E', 'e', 'F', 'f' };
+                                          'c', 'D', 'd', 'E', 'e', 'F', 'f' };
 
 
     public boolean isValidHexChar(char ch) {
@@ -237,21 +238,23 @@ else if (hasDot) {
                     || this.peek == 'M' || this.peek == 'N');
             Number value;
             if (isBigDecimal) {
-                value = getDecimalValue(sb);
+                value =
+                        new BigDecimal(this.getBigNumberLexeme(sb),
+                            (MathContext) AviatorEvaluator.getOption(Options.MATH_CONTEXT));
             }
             else if (isBigInt) {
-                String lexeme = this.getBigNumberLexeme(sb);
-                value = new BigInteger(lexeme);
+                value = new BigInteger(this.getBigNumberLexeme(sb));
             }
             else if (hasDot) {
-				boolean alwaysUseDecimalAsDouble = AviatorEvaluator
-						.getOption(Options.ALWAYS_USE_DOUBLE_AS_DECIMAL);
-				if (alwaysUseDecimalAsDouble) {
-					value = new BigDecimal(sb.toString(),
-							AviatorEvaluator.getMathContext());
-				} else {
-					value = dval;
-				}
+                boolean alwaysUseDecimalAsDouble = AviatorEvaluator.getOption(Options.ALWAYS_USE_DOUBLE_AS_DECIMAL);
+                if (alwaysUseDecimalAsDouble) {
+                    value =
+                            new BigDecimal(sb.toString(),
+                                (MathContext) AviatorEvaluator.getOption(Options.MATH_CONTEXT));
+                }
+                else {
+                    value = dval;
+                }
             }
             else {
                 // if the long value is out of range,then it must be negative,so
@@ -318,15 +321,6 @@ else if (hasDot) {
         return token;
     }
 
-
-	private Number getDecimalValue(StringBuffer sb) {
-		Number value;
-		String lexeme = this.getBigNumberLexeme(sb);
-		value = new BigDecimal(lexeme, AviatorEvaluator.getMathContext());
-		return value;
-	}
-
-
     private String getBigNumberLexeme(StringBuffer sb) {
         String lexeme = sb.toString();
         lexeme = lexeme.substring(0, lexeme.length() - 1);
