Reformat code

Author: duangsuse

app/src/main/java/bsh/BSHAllocationExpression.java

@@ -3,14 +3,16 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 
-/** New object, new array, or inner class style allocation with body. */
+/**
+ * New object, new array, or inner class style allocation with body.
+ */
 class BSHAllocationExpression extends SimpleNode {
+    private static int innerClassCount = 0;
+
     BSHAllocationExpression(int id) {
         super(id);
     }
 
-    private static int innerClassCount = 0;
-
     public Object eval(CallStack callstack, Interpreter interpreter) throws EvalError {
         // type is either a class name or a primitive type
         SimpleNode type = (SimpleNode) jjtGetChild(0);
@@ -208,7 +210,7 @@ when VOID the prescribed array dimensions (defined and undefined)
     /**
      * Create an array of the dimensions specified in dimensionsNode. dimensionsNode may contain a
      * number of "undefined" as well as "defined" dimensions.
-     *
+     * <p>
      * <p>Background: in Java arrays are implemented in arrays-of-arrays style where, for example, a
      * two dimensional array is a an array of arrays of some base type. Each dimension-type has a
      * Java class type associated with it... so if foo = new int[5][5] then the type of foo is int
@@ -217,7 +219,7 @@ when VOID the prescribed array dimensions (defined and undefined)
      * if foo = new int [5][]; then foo[0] == null //true; and can later be assigned with the
      * appropriate type, e.g. foo[0] = new int[5]; (See Learning Java, O'Reilly & Associates more
      * background).
-     *
+     * <p>
      * <p>To create an array with undefined trailing dimensions using the reflection API we must use
      * an array type to represent the lower order (undefined) dimensions as the "base" type for the
      * array creation... Java will then create the correct type by adding the dimensions of the base

app/src/main/java/bsh/BSHArguments.java

@@ -7,7 +7,7 @@ class BSHArguments extends SimpleNode {
 
     /**
      * This node holds a set of arguments for a method invocation or constructor call.
-     *
+     * <p>
      * <p>Note: arguments are not currently allowed to be VOID.
      */
     /*

app/src/main/java/bsh/BSHArrayDimensions.java

@@ -36,12 +36,12 @@ public Object eval(Class type, CallStack callstack, Interpreter interpreter) thr
 
     /**
      * Evaluate the structure of the array in one of two ways:
-     *
+     * <p>
      * <p>a) an initializer exists, evaluate it and return the fully constructed array object, also
      * record the dimensions of that array
-     *
+     * <p>
      * <p>b) evaluate and record the lengths in each dimension and return void.
-     *
+     * <p>
      * <p>The structure of the array dims is maintained in dimensions.
      */
     public Object eval(CallStack callstack, Interpreter interpreter) throws EvalError {

app/src/main/java/bsh/BSHArrayInitializer.java

@@ -14,7 +14,7 @@ public Object eval(CallStack callstack, Interpreter interpreter) throws EvalErro
     /**
      * Construct the array from the initializer syntax.
      *
-     * @param baseType the base class type of the array (no dimensionality)
+     * @param baseType   the base class type of the array (no dimensionality)
      * @param dimensions the top number of dimensions of the array e.g. 2 for a String [][];
      */
     public Object eval(Class baseType, int dimensions, CallStack callstack, Interpreter interpreter)

app/src/main/java/bsh/BSHAssignment.java

@@ -21,7 +21,7 @@ public Object eval(CallStack callstack, Interpreter interpreter) throws EvalErro
         // e.g. i=1; i+=i++; // should be 2 not 3
         Object lhsValue = null;
         if (operator != ASSIGN) // assign doesn't need the pre-value
-        try {
+            try {
                 lhsValue = lhs.getValue();
             } catch (UtilEvalError e) {
                 throw e.toEvalError(this, callstack);
@@ -110,13 +110,13 @@ else if (lhs == Primitive.NULL || rhs == Primitive.NULL)
                 throw new UtilEvalError("对空对象或'null'字面的非法使用");
 
         if ((lhs instanceof Boolean
-                        || lhs instanceof Character
-                        || lhs instanceof Number
-                        || lhs instanceof Primitive)
+                || lhs instanceof Character
+                || lhs instanceof Number
+                || lhs instanceof Primitive)
                 && (rhs instanceof Boolean
-                        || rhs instanceof Character
-                        || rhs instanceof Number
-                        || rhs instanceof Primitive)) {
+                || rhs instanceof Character
+                || rhs instanceof Number
+                || rhs instanceof Primitive)) {
             return Primitive.binaryOperation(lhs, rhs, kind);
         }
 

app/src/main/java/bsh/BSHBlock.java

@@ -14,11 +14,11 @@ public Object eval(CallStack callstack, Interpreter interpreter) throws EvalErro
 
     /**
      * @param overrideNamespace if set to true the block will be executed in the current namespace
-     *     (not a subordinate one).
-     *     <p>If true *no* new BlockNamespace will be swapped onto the stack and the eval will
-     *     happen in the current top namespace. This is used by BshMethod, TryStatement, etc. which
-     *     must intialize the block first and also for those that perform multiple passes in the
-     *     same block.
+     *                          (not a subordinate one).
+     *                          <p>If true *no* new BlockNamespace will be swapped onto the stack and the eval will
+     *                          happen in the current top namespace. This is used by BshMethod, TryStatement, etc. which
+     *                          must intialize the block first and also for those that perform multiple passes in the
+     *                          same block.
      */
     public Object eval(CallStack callstack, Interpreter interpreter, boolean overrideNamespace)
             throws EvalError {
@@ -31,7 +31,7 @@ public Object eval(CallStack callstack, Interpreter interpreter, boolean overrid
 
         Object ret;
         if (isSynchronized) // Do the actual synchronization
-        synchronized (syncValue) {
+            synchronized (syncValue) {
                 ret = evalBlock(callstack, interpreter, overrideNamespace, null);
             }
         else ret = evalBlock(callstack, interpreter, overrideNamespace, null);

app/src/main/java/bsh/BSHCastExpression.java

@@ -2,7 +2,7 @@
 
 /**
  * Implement casts.
- *
+ * <p>
  * <p>I think it should be possible to simplify some of the code here by using the
  * Types.getAssignableForm() method, but I haven't looked into it.
  */
@@ -12,7 +12,9 @@ public BSHCastExpression(int id) {
         super(id);
     }
 
-    /** @return the result of the cast. */
+    /**
+     * @return the result of the cast.
+     */
     public Object eval(CallStack callstack, Interpreter interpreter) throws EvalError {
         NameSpace namespace = callstack.top();
         Class toType = ((BSHType) jjtGetChild(0)).getType(callstack, interpreter);

app/src/main/java/bsh/BSHForStatement.java

@@ -1,6 +1,8 @@
 package bsh;
 
-/** Implementation of the for(;;) statement. */
+/**
+ * Implementation of the for(;;) statement.
+ */
 class BSHForStatement extends SimpleNode implements ParserConstants {
     public boolean hasForInit;
     public boolean hasExpression;
@@ -23,7 +25,7 @@ public Object eval(CallStack callstack, Interpreter interpreter) throws EvalErro
         if (hasExpression) expression = ((SimpleNode) jjtGetChild(i++));
         if (hasForUpdate) forUpdate = ((SimpleNode) jjtGetChild(i++));
         if (i < jjtGetNumChildren()) // should normally be
-        statement = ((SimpleNode) jjtGetChild(i));
+            statement = ((SimpleNode) jjtGetChild(i));
 
         NameSpace enclosingNameSpace = callstack.top();
         BlockNameSpace forNameSpace = new BlockNameSpace(enclosingNameSpace);

app/src/main/java/bsh/BSHFormalParameter.java

@@ -1,6 +1,8 @@
 package bsh;
 
-/** A formal parameter declaration. For loose variable declaration type is null. */
+/**
+ * A formal parameter declaration. For loose variable declaration type is null.
+ */
 class BSHFormalParameter extends SimpleNode {
     public static final Class UNTYPED = null;
     public String name;
@@ -21,7 +23,9 @@ public String getTypeDescriptor(
             return "Ljava/lang/Object;"; // Object type
     }
 
-    /** Evaluate the type. */
+    /**
+     * Evaluate the type.
+     */
     public Object eval(CallStack callstack, Interpreter interpreter) throws EvalError {
         if (jjtGetNumChildren() > 0)
             type = ((BSHType) jjtGetChild(0)).getType(callstack, interpreter);

app/src/main/java/bsh/BSHFormalParameters.java

@@ -1,13 +1,14 @@
 package bsh;
 
 class BSHFormalParameters extends SimpleNode {
-    private String[] paramNames;
-    /** For loose type parameters the paramTypes are null. */
+    /**
+     * For loose type parameters the paramTypes are null.
+     */
     // unsafe caching of types
     Class[] paramTypes;
-
     int numArgs;
     String[] typeDescriptors;
+    private String[] paramNames;
 
     BSHFormalParameters(int id) {
         super(id);
@@ -48,7 +49,9 @@ public String[] getTypeDescriptors(
         return typeDesc;
     }
 
-    /** Evaluate the types. Note that type resolution does not require the interpreter instance. */
+    /**
+     * Evaluate the types. Note that type resolution does not require the interpreter instance.
+     */
     public Object eval(CallStack callstack, Interpreter interpreter) throws EvalError {
         if (paramTypes != null) return paramTypes;