1 files changed, 0 insertions, 101 deletions
diff --git a/java/openjdk6/files/icedtea/openjdk/8016653-ignoreable_characters.patch b/java/openjdk6/files/icedtea/openjdk/8016653-ignoreable_characters.patch
deleted file mode 100644
index 23f2d235facc..000000000000
--- a/java/openjdk6/files/icedtea/openjdk/8016653-ignoreable_characters.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-# HG changeset patch
-# User robm
-# Date 1383034867 0
-#      Tue Oct 29 08:21:07 2013 +0000
-# Node ID e6d4480e2b11853e5ec5bbced3d351564e174632
-# Parent  843659ece699889459239c6470e67265de2b3f73
-8016653: javadoc should ignore ignoreable characters in names
-Reviewed-by: jjg
-
-diff -r 843659ece699 -r e6d4480e2b11 src/share/classes/com/sun/tools/javac/parser/Scanner.java
---- langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Fri Jul 19 16:02:59 2013 -0700
-+++ langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Tue Oct 29 08:21:07 2013 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -514,11 +514,10 @@
-     private void scanIdent() {
-         boolean isJavaIdentifierPart;
-         char high;
-+        if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-+        // optimization, was: putChar(ch);
-+        scanChar();
-         do {
--            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
--            // optimization, was: putChar(ch);
--
--            scanChar();
-             switch (ch) {
-             case 'A': case 'B': case 'C': case 'D': case 'E':
-             case 'F': case 'G': case 'H': case 'I': case 'J':
-@@ -535,6 +534,7 @@
-             case '$': case '_':
-             case '0': case '1': case '2': case '3': case '4':
-             case '5': case '6': case '7': case '8': case '9':
-+                break;
-             case '\u0000': case '\u0001': case '\u0002': case '\u0003':
-             case '\u0004': case '\u0005': case '\u0006': case '\u0007':
-             case '\u0008': case '\u000E': case '\u000F': case '\u0010':
-@@ -542,30 +542,37 @@
-             case '\u0015': case '\u0016': case '\u0017':
-             case '\u0018': case '\u0019': case '\u001B':
-             case '\u007F':
--                break;
-+                scanChar();
-+                continue;
-             case '\u001A': // EOI is also a legal identifier part
-                 if (bp >= buflen) {
-                     name = names.fromChars(sbuf, 0, sp);
-                     token = keywords.key(name);
-                     return;
-                 }
--                break;
-+                scanChar();
-+                continue;
-             default:
-                 if (ch < '\u0080') {
-                     // all ASCII range chars already handled, above
-                     isJavaIdentifierPart = false;
-                 } else {
--                    high = scanSurrogates();
--                    if (high != 0) {
--                        if (sp == sbuf.length) {
--                            putChar(high);
-+                    if (Character.isIdentifierIgnorable(ch)) {
-+                        scanChar();
-+                        continue;
-+                    } else {
-+                        high = scanSurrogates();
-+                        if (high != 0) {
-+                            if (sp == sbuf.length) {
-+                                putChar(high);
-+                            } else {
-+                                sbuf[sp++] = high;
-+                            }
-+                            isJavaIdentifierPart = Character.isJavaIdentifierPart(
-+                                Character.toCodePoint(high, ch));
-                         } else {
--                            sbuf[sp++] = high;
-+                            isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
-                         }
--                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
--                            Character.toCodePoint(high, ch));
--                    } else {
--                        isJavaIdentifierPart = Character.isJavaIdentifierPart(ch);
-                     }
-                 }
-                 if (!isJavaIdentifierPart) {
-@@ -574,6 +581,9 @@
-                     return;
-                 }
-             }
-+            if (sp == sbuf.length) putChar(ch); else sbuf[sp++] = ch;
-+            // optimization, was: putChar(ch);
-+            scanChar();
-         } while (true);
-     }
-