JS parser: auto-reformat JsParser.java

js/js.parser/src/com/google/gwt/dev/js/JsParser.java

@@ -84,13 +84,17 @@ import java.util.Stack;
  */
 public class JsParser {
 
-  public static List<JsStatement> parse(SourceInfo rootSourceInfo,
+    public static List<JsStatement> parse(
-      JsScope scope, Reader r) throws IOException, JsParserException {
+            SourceInfo rootSourceInfo,
+            JsScope scope, Reader r
+    ) throws IOException, JsParserException {
         return new JsParser().parseImpl(rootSourceInfo, scope, r);
     }
 
-  public static void parseInto(SourceInfo rootSourceInfo, JsScope scope,
+    public static void parseInto(
-      JsBlock block, Reader r) throws IOException, JsParserException {
+            SourceInfo rootSourceInfo, JsScope scope,
+            JsBlock block, Reader r
+    ) throws IOException, JsParserException {
         List<JsStatement> childStmts = parse(rootSourceInfo, scope, r);
         List<JsStatement> parentStmts = block.getStatements();
         parentStmts.addAll(childStmts);
@@ -102,8 +106,10 @@ public class JsParser {
     private JsParser() {
     }
 
-  List<JsStatement> parseImpl(final SourceInfo rootSourceInfo, JsScope scope,
+    List<JsStatement> parseImpl(
-      Reader r) throws JsParserException, IOException {
+            final SourceInfo rootSourceInfo, JsScope scope,
+            Reader r
+    ) throws JsParserException, IOException {
         // Create a custom error handler so that we can throw our own exceptions.
         Context.enter().setErrorReporter(new ErrorReporter() {
             @Override
@@ -113,8 +119,10 @@ public class JsParser {
             }
 
             @Override
-      public EvaluatorException runtimeError(String msg, String loc, int ln,
+            public EvaluatorException runtimeError(
-          String src, int col) {
+                    String msg, String loc, int ln,
+                    String src, int col
+            ) {
                 // Never called, but just in case.
                 throw new UncheckedJsParserException(new JsParserException(msg, ln,
                                                                            src, col, rootSourceInfo.getFileName()));
@@ -138,9 +146,11 @@ public class JsParser {
             List<JsStatement> stmts = mapStatements(topNode);
             popScope();
             return stmts;
-    } catch (UncheckedJsParserException e) {
+        }
+        catch (UncheckedJsParserException e) {
             throw e.getParserException();
-    } finally {
+        }
+        finally {
             Context.exit();
         }
     }
@@ -377,7 +387,8 @@ public class JsParser {
             JsStringLiteral lit = (JsStringLiteral) unknown;
             String litName = lit.getValue();
             return new JsNameRef(makeSourceInfo(nameRefNode), litName);
-    } else {
+        }
+        else {
             throw createParserException("Expecting a name reference", nameRefNode);
         }
     }
@@ -451,7 +462,8 @@ public class JsParser {
         Node fromLabel = breakNode.getFirstChild();
         if (fromLabel != null) {
             return new JsBreak(makeSourceInfo(breakNode), mapName(fromLabel));
-    } else {
+        }
+        else {
             return new JsBreak(makeSourceInfo(breakNode));
         }
     }
@@ -497,7 +509,8 @@ public class JsParser {
         Node fromLabel = contNode.getFirstChild();
         if (fromLabel != null) {
             return new JsContinue(makeSourceInfo(contNode), mapName(fromLabel));
-    } else {
+        }
+        else {
             return new JsContinue(makeSourceInfo(contNode));
         }
     }
@@ -514,10 +527,12 @@ public class JsParser {
         if (to instanceof JsNameRef) {
             return new JsPrefixOperation(makeSourceInfo(node),
                                          JsUnaryOperator.DELETE, to);
-    } else if (to instanceof JsArrayAccess) {
+        }
+        else if (to instanceof JsArrayAccess) {
             return new JsPrefixOperation(makeSourceInfo(node),
                                          JsUnaryOperator.DELETE, to);
-    } else {
+        }
+        else {
             throw createParserException(
                     "'delete' can only operate on property names and array elements",
                     from);
@@ -534,7 +549,8 @@ public class JsParser {
         if (isWhile) {
             fromTestExpr = ifNode.getFirstChild();
             fromBody = ifNode.getFirstChild().getNext();
-    } else {
+        }
+        else {
             fromBody = ifNode.getFirstChild();
             fromTestExpr = ifNode.getFirstChild().getNext();
         }
@@ -556,7 +572,8 @@ public class JsParser {
         //
         if (isWhile) {
             return new JsWhile(info, toTestExpr, toBody);
-    } else {
+        }
+        else {
             return new JsDoWhile(info, toTestExpr, toBody);
         }
     }
@@ -597,7 +614,8 @@ public class JsParser {
         JsNode unknown = map(exprNode);
         if (unknown instanceof JsExpression) {
             return (JsExpression) unknown;
-    } else {
+        }
+        else {
             throw createParserException("Expecting an expression", exprNode);
         }
     }
@@ -638,7 +656,8 @@ public class JsParser {
                     //
                     toForIn.setIterExpr(mapOptionalExpression(fromIterInit));
                 }
-      } else {
+            }
+            else {
                 // An unnamed iterator var.
                 //
                 toForIn = new JsForIn(info);
@@ -651,12 +670,14 @@ public class JsParser {
             JsStatement bodyStmt = mapStatement(fromBody);
             if (bodyStmt != null) {
                 toForIn.setBody(bodyStmt);
-      } else {
+            }
+            else {
                 toForIn.setBody(new JsEmpty(info));
             }
 
             return toForIn;
-    } else {
+        }
+        else {
             // Regular ol' for loop.
             //
             JsFor toFor = new JsFor(info);
@@ -666,7 +687,8 @@ public class JsParser {
             if (initThingy != null) {
                 if (initThingy instanceof JsVars) {
                     toFor.setInitVars((JsVars) initThingy);
-        } else {
+                }
+                else {
                     assert (initThingy instanceof JsExpression);
                     toFor.setInitExpr((JsExpression) initThingy);
                 }
@@ -677,7 +699,8 @@ public class JsParser {
             JsStatement bodyStmt = mapStatement(fromBody);
             if (bodyStmt != null) {
                 toFor.setBody(bodyStmt);
-      } else {
+            }
+            else {
                 toFor.setBody(new JsEmpty(info));
             }
             return toFor;
@@ -746,7 +769,8 @@ public class JsParser {
         JsNameRef toNameRef;
         if (from2 != null) {
             toNameRef = mapAsPropertyNameRef(from2);
-    } else {
+        }
+        else {
             // Special properties don't have a second expression.
             //
             Object obj = getPropNode.getProp(Node.SPECIAL_PROP_PROP);
@@ -880,7 +904,8 @@ public class JsParser {
         if (unknown != null) {
             if (unknown instanceof JsExpression) {
                 return (JsExpression) unknown;
-      } else {
+            }
+            else {
                 throw createParserException("Expecting an expression or null", exprNode);
             }
         }
@@ -1030,12 +1055,15 @@ public class JsParser {
         if (unknown != null) {
             if (unknown instanceof JsStatement) {
                 return (JsStatement) unknown;
-      } else if (unknown instanceof JsExpression) {
+            }
+            else if (unknown instanceof JsExpression) {
                 return ((JsExpression) unknown).makeStmt();
-      } else {
+            }
+            else {
                 throw createParserException("Expecting a statement", nodeStmt);
             }
-    } else {
+        }
+        else {
             // When map() returns null, we return an empty statement.
             //
             return new JsEmpty(makeSourceInfo(nodeStmt));
@@ -1049,7 +1077,8 @@ public class JsParser {
             JsStatement stmt = mapStatement(curr);
             if (stmt != null) {
                 stmts.add(stmt);
-      } else {
+            }
+            else {
                 // When mapStatement() returns null, we just ignore it.
                 //
             }
@@ -1094,7 +1123,8 @@ public class JsParser {
                 // Attach the case to the switch.
                 //
                 toSwitch.getCases().add(toCase);
-      } else {
+            }
+            else {
                 // This should be the only default statement.
                 // If more than one is present, we keep the last one.
                 //
@@ -1209,7 +1239,8 @@ public class JsParser {
             case TokenStream.ADD:
                 if (unOp.getFirstChild().getType() != TokenStream.NUMBER) {
                     return mapPrefixOperation(JsUnaryOperator.POS, unOp);
-        } else {
+                }
+                else {
                     // Pretend we didn't see it.
                     return mapExpression(unOp.getFirstChild());
                 }