1 files changed, 22 insertions, 17 deletions

diff --git a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
index e8bcb303..c07bb369 100644
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
@@ -20,35 +20,40 @@
 package jdk.nashorn.internal.runtime.regexp.joni.ast;
 
 import java.util.Set;
-
 import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
 import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
 import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
 
+@SuppressWarnings("javadoc")
 public final class ConsAltNode extends Node {
     public Node car;
     public ConsAltNode cdr;
     private int type;           // List or Alt
 
-    private ConsAltNode(Node car, ConsAltNode cdr, int type) {
+    private ConsAltNode(final Node car, final ConsAltNode cdr, final int type) {
         this.car = car;
-        if (car != null) car.parent = this;
+        if (car != null) {
+            car.parent = this;
+        }
         this.cdr = cdr;
-        if (cdr != null) cdr.parent = this;
+        if (cdr != null) {
+            cdr.parent = this;
+        }
 
         this.type = type;
     }
 
-    public static ConsAltNode newAltNode(Node left, ConsAltNode right) {
+    public static ConsAltNode newAltNode(final Node left, final ConsAltNode right) {
         return new ConsAltNode(left, right, ALT);
     }
 
-    public static ConsAltNode newListNode(Node left, ConsAltNode right) {
+    public static ConsAltNode newListNode(final Node left, final ConsAltNode right) {
         return new ConsAltNode(left, right, LIST);
     }
 
-    public static ConsAltNode listAdd(ConsAltNode list, Node x) {
-        ConsAltNode n = newListNode(x, null);
+    public static ConsAltNode listAdd(final ConsAltNode listp, final Node x) {
+        final ConsAltNode n = newListNode(x, null);
+        ConsAltNode list = listp;
 
         if (list != null) {
             while (list.cdr != null) {
@@ -73,7 +78,7 @@ public final class ConsAltNode extends Node {
     }
 
     @Override
-    protected void setChild(Node newChild) {
+    protected void setChild(final Node newChild) {
         car = newChild;
     }
 
@@ -83,13 +88,13 @@ public final class ConsAltNode extends Node {
     }
 
     @Override
-    public void swap(Node with) {
+    public void swap(final Node with) {
         if (cdr != null) {
             cdr.parent = with;
             if (with instanceof ConsAltNode) {
-                ConsAltNode withCan = (ConsAltNode)with;
+                final ConsAltNode withCan = (ConsAltNode)with;
                 withCan.cdr.parent = this;
-                ConsAltNode tmp = cdr;
+                final ConsAltNode tmp = cdr;
                 cdr = withCan.cdr;
                 withCan.cdr = tmp;
             }
@@ -98,7 +103,7 @@ public final class ConsAltNode extends Node {
     }
 
     @Override
-    public void verifyTree(Set<Node> set, WarnCallback warnings) {
+    public void verifyTree(final Set<Node> set, final WarnCallback warnings) {
         if (!set.contains(this)) {
             set.add(this);
             if (car != null) {
@@ -116,13 +121,13 @@ public final class ConsAltNode extends Node {
         }
     }
 
-    public Node setCar(Node ca) {
+    public Node setCar(final Node ca) {
         car = ca;
         ca.parent = this;
         return car;
     }
 
-    public ConsAltNode setCdr(ConsAltNode cd) {
+    public ConsAltNode setCdr(final ConsAltNode cd) {
         cdr = cd;
         cd.parent = this;
         return cdr;
@@ -141,8 +146,8 @@ public final class ConsAltNode extends Node {
     }
 
     @Override
-    public String toString(int level) {
-        StringBuilder value = new StringBuilder();
+    public String toString(final int level) {
+        final StringBuilder value = new StringBuilder();
         value.append("\n  car: " + pad(car, level + 1));
         value.append("\n  cdr: " + (cdr == null ? "NULL" : cdr.toString()));