cleanup

Author: rbri

src/main/java/org/htmlunit/cyberneko/HTMLScanner.java

@@ -166,7 +166,7 @@ public class HTMLScanner implements XMLDocumentSource, XMLLocator, HTMLComponent
 
     /**
      * Ignore specified charset found in the <meta equiv='Content-Type'
-     * content='text/html;charset=…'> tag or in the <?xml …
+     * content='text/html;charset='…'> tag or in the <?xml …
      * encoding='…'> processing instruction.
      */
     public static final String IGNORE_SPECIFIED_CHARSET
@@ -335,9 +335,6 @@ public class HTMLScanner implements XMLDocumentSource, XMLLocator, HTMLComponent
     /** Scan return code: continue scanning (state transition). */
     private static final int SCAN_FALSE = 2;
 
-    /** Scan return code: scanner changed, return control to caller. */
-    private static final int SCAN_SCANNER_CHANGED = 3;
-
     // debugging
 
     /** Set to true to debug changes in the scanner. */
@@ -1544,11 +1541,11 @@ protected int scanEntityRef(final XMLString str, final XMLString plainValue, fin
         // the error route
         if (result.isMatch_) {
             // in case we overrun because the entity was broken or
-            // not terminated by a ;, we have to reset the char
+            // not terminated by a ';', we have to reset the char
             // position because we read one more char than the entity has
             fCurrentEntity.rewind(readCount - result.length_);
 
-            // if we have a correct character that is terminate by ;
+            // if we have a correct character that is terminated by ';'
             // we can keep things simple
             if (result.endsWithSemicolon_) {
                 if (plainValue != null) {
@@ -2598,7 +2595,7 @@ protected int scanComment() throws IOException {
         // Scans markup content.
         protected int scanCommentContent(final XMLString buffer) throws IOException {
             int c;
-            OUTER: while (true) {
+            while (true) {
                 c = fCurrentEntity.read();
                 if (c == -1) {
                     if (fReportErrors_) {
@@ -2621,7 +2618,7 @@ protected int scanCommentContent(final XMLString buffer) throws IOException {
                         if (fReportErrors_) {
                             fErrorReporter.reportError("HTML1007", null);
                         }
-                        break OUTER;
+                        break;
                     }
                     if (count < 2) {
                         buffer.append('-');
@@ -2687,7 +2684,7 @@ else if (c == '\n' || c == '\r') {
         // Scans cdata content.
         protected int scanCDataContent(final XMLString xmlString) throws IOException {
             int c;
-            OUTER: while (true) {
+            while (true) {
                 c = fCurrentEntity.read();
                 if (c == -1) {
                     if (fReportErrors_) {
@@ -2710,7 +2707,7 @@ protected int scanCDataContent(final XMLString xmlString) throws IOException {
                         if (fReportErrors_) {
                             fErrorReporter.reportError("HTML1007", null);
                         }
-                        break OUTER;
+                        break;
                     }
                     if (count < 2) {
                         xmlString.append(']');
@@ -3739,7 +3736,6 @@ else if (c == '<') {
                                 closeIndex++;
                             }
                             else if (c == '<') {
-                                state = ScanScriptState.DOUBLE_ESCAPED_LT;
                                 closeIndex = 0;
                             }
                             else {
@@ -3756,7 +3752,6 @@ else if (Character.isWhitespace(c)) {
                                 //         ^^^^^
                             }
                             else if (c == '<') {
-                                state = ScanScriptState.DOUBLE_ESCAPED_LT;
                                 closeIndex = 0;
                             }
                             else {

src/main/java/org/htmlunit/cyberneko/HTMLTagBalancer.java

@@ -1341,9 +1341,9 @@ protected final int getElementDepth(final HTMLElements.Element element) {
         int depth = -1;
         for (int i = fElementStack.top - 1; i >= fragmentContextStackSize_; i--) {
             final Info info = fElementStack.data[i];
-            if (info.element.code == element.code
+            if (info.element.code == elementCode
                     && (elementCode != HTMLElements.UNKNOWN
-                            || (elementCode == HTMLElements.UNKNOWN && element.name.equals(info.element.name)))) {
+                            || element.name.equals(info.element.name))) {
                 depth = fElementStack.top - i;
                 break;
             }
@@ -1375,6 +1375,7 @@ protected int getParentDepth(final Element element) {
                 if (info.element.code == bounds) {
                     break;
                 }
+
                 // use indexed loop to avoid Iterator allocation
                 for (int j = 0; j < parents.length; j++) {
                     final Element parent = parents[j];