archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8308040: Evaluate new public types in non-public classes

Browse source 
Reviewed-by: rriggs, darcy
This commit is contained in:
Jim Laskey 2023-05-24 19:08:39 +00:00
parent ac89e3045b
commit b44fa365ca
10 changed files with 593 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

175
src/java.base/share/classes/java/lang/runtime/ReferenceKey.java
View file

@ -25,7 +25,6 @@
package java.lang.runtime;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
@ -44,7 +43,7 @@ import java.util.Objects;
* Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
* Do not rely on its availability.
*/
interface ReferenceKey<T> {
sealed interface ReferenceKey<T> permits StrongReferenceKey, WeakReferenceKey, SoftReferenceKey {
/**
* {@return the value of the unwrapped key}
*/
@ -55,176 +54,4 @@ interface ReferenceKey<T> {
*/
void unused();
/**
* {@link WeakReference} wrapper key for entries in the backing map.
*
* @param <T> key type
*
* @since 21
*/
class WeakKey<T> extends WeakReference<T> implements ReferenceKey<T> {
/**
* Saved hashcode of the key. Used when {@link WeakReference} is
* null.
*/
private final int hashcode;
/**
* Private constructor.
*
* @param key unwrapped key value
* @param queue reference queue
*/
WeakKey(T key, ReferenceQueue<T> queue) {
super(key, queue);
this.hashcode = Objects.hashCode(key);
}
/**
* Cleanup unused key. No need to enqueue since the key did not make it
* into the map.
*/
@Override
public void unused() {
clear();
}
@Override
public boolean equals(Object obj) {
// Necessary when removing a null reference
if (obj == this) {
return true;
}
// Necessary when comparing an unwrapped key
if (obj instanceof ReferenceKey<?> key) {
obj = key.get();
}
return Objects.equals(get(), obj);
}
@Override
public int hashCode() {
// Use saved hashcode
return hashcode;
}
@Override
public String toString() {
return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
}
}
/**
* {@link SoftReference} wrapper key for entries in the backing map.
*
* @param <T> key type
*
* @since 21
*/
class SoftKey<T> extends SoftReference<T> implements ReferenceKey<T> {
/**
* Saved hashcode of the key. Used when {@link SoftReference} is
* null.
*/
private final int hashcode;
/**
* Private constructor.
*
* @param key unwrapped key value
* @param queue reference queue
*/
SoftKey(T key, ReferenceQueue<T> queue) {
super(key, queue);
this.hashcode = Objects.hashCode(key);
}
/**
* Cleanup unused key. No need to enqueue since the key did not make it
* into the map.
*/
@Override
public void unused() {
clear();
}
@Override
public boolean equals(Object obj) {
// Necessary when removing a null reference
if (obj == this) {
return true;
}
// Necessary when comparing an unwrapped key
if (obj instanceof ReferenceKey<?> key) {
obj = key.get();
}
return Objects.equals(get(), obj);
}
@Override
public int hashCode() {
// Use saved hashcode
return hashcode;
}
@Override
public String toString() {
return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
}
}
/**
* Wrapper for querying the backing map. Avoids the overhead of an
* {@link Reference} object.
*
* @param <T> key type
*
* @since 21
*/
class StrongKey<T> implements ReferenceKey<T> {
T key;
/**
* Private constructor.
*
* @param key unwrapped key value
*/
StrongKey(T key) {
this.key = key;
}
/**
* {@return the unwrapped key}
*/
@Override
public T get() {
return key;
}
@Override
public void unused() {
key = null;
}
@Override
public boolean equals(Object obj) {
// Necessary when comparing an unwrapped key
if (obj instanceof ReferenceKey<?> key) {
obj = key.get();
}
return Objects.equals(get(), obj);
}
@Override
public int hashCode() {
// Use unwrapped key hash code
return get().hashCode();
}
@Override
public String toString() {
return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
}
}
}

10
src/java.base/share/classes/java/lang/runtime/ReferencedKeyMap.java
View file

@ -95,7 +95,7 @@ final class ReferencedKeyMap<K, V> implements Map<K, V> {
private final Map<ReferenceKey<K>, V> map;
/**
* {@link ReferenceQueue} for cleaning up {@link ReferenceKey.WeakKey EntryKeys}.
* {@link ReferenceQueue} for cleaning up {@link WeakReferenceKey EntryKeys}.
*/
private final ReferenceQueue<K> stale;
@ -153,9 +153,9 @@ final class ReferencedKeyMap<K, V> implements Map<K, V> {
@SuppressWarnings("unchecked")
private ReferenceKey<K> entryKey(Object key) {
if (isSoft) {
return new ReferenceKey.SoftKey<>((K)key, stale);
return new SoftReferenceKey<>((K)key, stale);
} else {
return new ReferenceKey.WeakKey<>((K)key, stale);
return new WeakReferenceKey<>((K)key, stale);
}
}
@ -166,7 +166,7 @@ final class ReferencedKeyMap<K, V> implements Map<K, V> {
*/
@SuppressWarnings("unchecked")
private ReferenceKey<K> lookupKey(Object key) {
return new ReferenceKey.StrongKey<>((K)key);
return new StrongReferenceKey<>((K)key);
}
@Override
@ -323,7 +323,7 @@ final class ReferencedKeyMap<K, V> implements Map<K, V> {
@SuppressWarnings("unchecked")
public void removeStaleReferences() {
while (true) {
ReferenceKey.WeakKey<K> key = (ReferenceKey.WeakKey<K>)stale.poll();
WeakReferenceKey<K> key = (WeakReferenceKey<K>)stale.poll();
if (key == null) {
break;
}

92
src/java.base/share/classes/java/lang/runtime/SoftReferenceKey.java Normal file
View file

@ -0,0 +1,92 @@
/*
* Copyright (c) 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.lang.runtime;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.util.Objects;
/**
* {@link SoftReference} wrapper key for entries in the backing map.
*
* @param <T> key type
*
* @since 21
*
* Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
* Do not rely on its availability.
*/
final class SoftReferenceKey<T> extends SoftReference<T> implements ReferenceKey<T> {
/**
* Saved hashcode of the key. Used when {@link SoftReference} is
* null.
*/
private final int hashcode;
/**
* Package-Protected constructor.
*
* @param key unwrapped key value
* @param queue reference queue
*/
SoftReferenceKey(T key, ReferenceQueue<T> queue) {
super(key, queue);
this.hashcode = Objects.hashCode(key);
}
/**
* Cleanup unused key. No need to enqueue since the key did not make it
* into the map.
*/
@Override
public void unused() {
clear();
}
@Override
public boolean equals(Object obj) {
// Necessary when removing a null reference
if (obj == this) {
return true;
}
// Necessary when comparing an unwrapped key
if (obj instanceof ReferenceKey<?> key) {
obj = key.get();
}
return Objects.equals(get(), obj);
}
@Override
public int hashCode() {
// Use saved hashcode
return hashcode;
}
@Override
public String toString() {
return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
}
}

85
src/java.base/share/classes/java/lang/runtime/StrongReferenceKey.java Normal file
View file

@ -0,0 +1,85 @@
/*
* Copyright (c) 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.lang.runtime;
import java.util.Objects;
/**
* Wrapper for querying the backing map. Avoids the overhead of an
* {@link java.lang.ref.Reference} object.
*
* @param <T> key type
*
* @since 21
*
* Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
* Do not rely on its availability.
*/
final class StrongReferenceKey<T> implements ReferenceKey<T> {
T key;
/**
* Package-Protected constructor.
*
* @param key unwrapped key value
*/
StrongReferenceKey(T key) {
this.key = key;
}
/**
* {@return the unwrapped key}
*/
@Override
public T get() {
return key;
}
@Override
public void unused() {
key = null;
}
@Override
public boolean equals(Object obj) {
// Necessary when comparing an unwrapped key
if (obj instanceof ReferenceKey<?> key) {
obj = key.get();
}
return Objects.equals(get(), obj);
}
@Override
public int hashCode() {
// Use unwrapped key hash code
return get().hashCode();
}
@Override
public String toString() {
return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
}
}

92
src/java.base/share/classes/java/lang/runtime/WeakReferenceKey.java Normal file
View file

@ -0,0 +1,92 @@
/*
* Copyright (c) 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.lang.runtime;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.Objects;
/**
* {@link WeakReference} wrapper key for entries in the backing map.
*
* @param <T> key type
*
* @since 21
*
* Warning: This class is part of PreviewFeature.Feature.STRING_TEMPLATES.
* Do not rely on its availability.
*/
final class WeakReferenceKey<T> extends WeakReference<T> implements ReferenceKey<T> {
/**
* Saved hashcode of the key. Used when {@link WeakReference} is
* null.
*/
private final int hashcode;
/**
* Package-Protected constructor.
*
* @param key unwrapped key value
* @param queue reference queue
*/
WeakReferenceKey(T key, ReferenceQueue<T> queue) {
super(key, queue);
this.hashcode = Objects.hashCode(key);
}
/**
* Cleanup unused key. No need to enqueue since the key did not make it
* into the map.
*/
@Override
public void unused() {
clear();
}
@Override
public boolean equals(Object obj) {
// Necessary when removing a null reference
if (obj == this) {
return true;
}
// Necessary when comparing an unwrapped key
if (obj instanceof ReferenceKey<?> key) {
obj = key.get();
}
return Objects.equals(get(), obj);
}
@Override
public int hashCode() {
// Use saved hashcode
return hashcode;
}
@Override
public String toString() {
return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
}
}

134
src/java.base/share/classes/java/util/DecimalDigits.java Normal file
View file

@ -0,0 +1,134 @@
/*
* Copyright (c) 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.util;
import java.lang.invoke.MethodHandle;
import jdk.internal.vm.annotation.Stable;
/**
* Digits class for decimal digits.
*
* @since 21
*/
final class DecimalDigits implements Digits {
@Stable
private static final short[] DIGITS;
/**
* Singleton instance of DecimalDigits.
*/
static final Digits INSTANCE = new DecimalDigits();
static {
short[] digits = new short[10 * 10];
for (int i = 0; i < 10; i++) {
short hi = (short) ((i + '0') << 8);
for (int j = 0; j < 10; j++) {
short lo = (short) (j + '0');
digits[i * 10 + j] = (short) (hi | lo);
}
}
DIGITS = digits;
}
/**
* Constructor.
*/
private DecimalDigits() {
}
@Override
public int digits(long value, byte[] buffer, int index,
MethodHandle putCharMH) throws Throwable {
boolean negative = value < 0;
if (!negative) {
value = -value;
}
long q;
int r;
while (value <= Integer.MIN_VALUE) {
q = value / 100;
r = (int)((q * 100) - value);
value = q;
int digits = DIGITS[r];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
int iq, ivalue = (int)value;
while (ivalue <= -100) {
iq = ivalue / 100;
r = (iq * 100) - ivalue;
ivalue = iq;
int digits = DIGITS[r];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
if (ivalue < 0) {
ivalue = -ivalue;
}
int digits = DIGITS[ivalue];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
if (9 < ivalue) {
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
if (negative) {
putCharMH.invokeExact(buffer, --index, (int)'-');
}
return index;
}
@Override
public int size(long value) {
boolean negative = value < 0;
int sign = negative ? 1 : 0;
if (!negative) {
value = -value;
}
long precision = -10;
for (int i = 1; i < 19; i++) {
if (value > precision)
return i + sign;
precision = 10 * precision;
}
return 19 + sign;
}
}

224
src/java.base/share/classes/java/util/Digits.java
View file

@ -27,15 +27,13 @@ package java.util;
import java.lang.invoke.MethodHandle;
import jdk.internal.vm.annotation.Stable;
/**
* Digits provides a fast methodology for converting integers and longs to
* ASCII strings.
*
* @since 21
*/
sealed interface Digits permits Digits.DecimalDigits, Digits.HexDigits, Digits.OctalDigits {
sealed interface Digits permits DecimalDigits, HexDigits, OctalDigits {
/**
* Insert digits for long value in buffer from high index to low index.
*
@ -60,224 +58,4 @@ sealed interface Digits permits Digits.DecimalDigits, Digits.HexDigits, Digits.O
*/
int size(long value);
/**
* Digits class for decimal digits.
*/
final class DecimalDigits implements Digits {
@Stable
private static final short[] DIGITS;
/**
* Singleton instance of DecimalDigits.
*/
static final Digits INSTANCE = new DecimalDigits();
static {
short[] digits = new short[10 * 10];
for (int i = 0; i < 10; i++) {
short hi = (short) ((i + '0') << 8);
for (int j = 0; j < 10; j++) {
short lo = (short) (j + '0');
digits[i * 10 + j] = (short) (hi | lo);
}
}
DIGITS = digits;
}
/**
* Constructor.
*/
private DecimalDigits() {
}
@Override
public int digits(long value, byte[] buffer, int index,
MethodHandle putCharMH) throws Throwable {
boolean negative = value < 0;
if (!negative) {
value = -value;
}
long q;
int r;
while (value <= Integer.MIN_VALUE) {
q = value / 100;
r = (int)((q * 100) - value);
value = q;
int digits = DIGITS[r];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
int iq, ivalue = (int)value;
while (ivalue <= -100) {
iq = ivalue / 100;
r = (iq * 100) - ivalue;
ivalue = iq;
int digits = DIGITS[r];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
if (ivalue < 0) {
ivalue = -ivalue;
}
int digits = DIGITS[ivalue];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
if (9 < ivalue) {
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
if (negative) {
putCharMH.invokeExact(buffer, --index, (int)'-');
}
return index;
}
@Override
public int size(long value) {
boolean negative = value < 0;
int sign = negative ? 1 : 0;
if (!negative) {
value = -value;
}
long precision = -10;
for (int i = 1; i < 19; i++) {
if (value > precision)
return i + sign;
precision = 10 * precision;
}
return 19 + sign;
}
}
/**
* Digits class for hexadecimal digits.
*/
final class HexDigits implements Digits {
@Stable
private static final short[] DIGITS;
/**
* Singleton instance of HexDigits.
*/
static final Digits INSTANCE = new HexDigits();
static {
short[] digits = new short[16 * 16];
for (int i = 0; i < 16; i++) {
short hi = (short) ((i < 10 ? i + '0' : i - 10 + 'a') << 8);
for (int j = 0; j < 16; j++) {
short lo = (short) (j < 10 ? j + '0' : j - 10 + 'a');
digits[(i << 4) + j] = (short) (hi | lo);
}
}
DIGITS = digits;
}
/**
* Constructor.
*/
private HexDigits() {
}
@Override
public int digits(long value, byte[] buffer, int index,
MethodHandle putCharMH) throws Throwable {
while ((value & ~0xFF) != 0) {
int digits = DIGITS[(int) (value & 0xFF)];
value >>>= 8;
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
int digits = DIGITS[(int) (value & 0xFF)];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
if (0xF < value) {
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
return index;
}
@Override
public int size(long value) {
return value == 0 ? 1 :
67 - Long.numberOfLeadingZeros(value) >> 2;
}
}
/**
* Digits class for octal digits.
*/
final class OctalDigits implements Digits {
@Stable
private static final short[] DIGITS;
/**
* Singleton instance of OctalDigits.
*/
static final Digits INSTANCE = new OctalDigits();
static {
short[] digits = new short[8 * 8];
for (int i = 0; i < 8; i++) {
short hi = (short) ((i + '0') << 8);
for (int j = 0; j < 8; j++) {
short lo = (short) (j + '0');
digits[(i << 3) + j] = (short) (hi | lo);
}
}
DIGITS = digits;
}
/**
* Constructor.
*/
private OctalDigits() {
}
@Override
public int digits(long value, byte[] buffer, int index,
MethodHandle putCharMH) throws Throwable {
while ((value & ~0x3F) != 0) {
int digits = DIGITS[(int) (value & 0x3F)];
value >>>= 6;
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
int digits = DIGITS[(int) (value & 0x3F)];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
if (7 < value) {
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
return index;
}
@Override
public int size(long value) {
return (66 - Long.numberOfLeadingZeros(value)) / 3;
}
}
}

1
src/java.base/share/classes/java/util/FormatItem.java
View file

@ -31,7 +31,6 @@ import java.lang.invoke.MethodHandles.Lookup;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.text.DecimalFormatSymbols;
import java.util.Digits.*;
import java.util.Formatter.FormatSpecifier;
import jdk.internal.access.JavaLangAccess;

92
src/java.base/share/classes/java/util/HexDigits.java Normal file
View file

@ -0,0 +1,92 @@
/*
* Copyright (c) 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.util;
import java.lang.invoke.MethodHandle;
import jdk.internal.vm.annotation.Stable;
/**
* Digits class for hexadecimal digits.
*
* @since 21
*/
final class HexDigits implements Digits {
@Stable
private static final short[] DIGITS;
/**
* Singleton instance of HexDigits.
*/
static final Digits INSTANCE = new HexDigits();
static {
short[] digits = new short[16 * 16];
for (int i = 0; i < 16; i++) {
short hi = (short) ((i < 10 ? i + '0' : i - 10 + 'a') << 8);
for (int j = 0; j < 16; j++) {
short lo = (short) (j < 10 ? j + '0' : j - 10 + 'a');
digits[(i << 4) + j] = (short) (hi | lo);
}
}
DIGITS = digits;
}
/**
* Constructor.
*/
private HexDigits() {
}
@Override
public int digits(long value, byte[] buffer, int index,
MethodHandle putCharMH) throws Throwable {
while ((value & ~0xFF) != 0) {
int digits = DIGITS[(int) (value & 0xFF)];
value >>>= 8;
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
int digits = DIGITS[(int) (value & 0xFF)];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
if (0xF < value) {
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
return index;
}
@Override
public int size(long value) {
return value == 0 ? 1 :
67 - Long.numberOfLeadingZeros(value) >> 2;
}
}

91
src/java.base/share/classes/java/util/OctalDigits.java Normal file
View file

@ -0,0 +1,91 @@
/*
* Copyright (c) 2023, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.util;
import java.lang.invoke.MethodHandle;
import jdk.internal.vm.annotation.Stable;
/**
* Digits class for octal digits.
*
* @since 21
*/
final class OctalDigits implements Digits {
@Stable
private static final short[] DIGITS;
/**
* Singleton instance of OctalDigits.
*/
static final Digits INSTANCE = new OctalDigits();
static {
short[] digits = new short[8 * 8];
for (int i = 0; i < 8; i++) {
short hi = (short) ((i + '0') << 8);
for (int j = 0; j < 8; j++) {
short lo = (short) (j + '0');
digits[(i << 3) + j] = (short) (hi | lo);
}
}
DIGITS = digits;
}
/**
* Constructor.
*/
private OctalDigits() {
}
@Override
public int digits(long value, byte[] buffer, int index,
MethodHandle putCharMH) throws Throwable {
while ((value & ~0x3F) != 0) {
int digits = DIGITS[(int) (value & 0x3F)];
value >>>= 6;
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
int digits = DIGITS[(int) (value & 0x3F)];
putCharMH.invokeExact(buffer, --index, digits & 0xFF);
if (7 < value) {
putCharMH.invokeExact(buffer, --index, digits >> 8);
}
return index;
}
@Override
public int size(long value) {
return (66 - Long.numberOfLeadingZeros(value)) / 3;
}
}