cd6d4007aa
libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
831 lines
23 KiB
Java
831 lines
23 KiB
Java
/* Long.java -- object wrapper for long
|
|
Copyright (C) 1998, 1999, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath 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 for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.lang;
|
|
|
|
/**
|
|
* Instances of class <code>Long</code> represent primitive
|
|
* <code>long</code> values.
|
|
*
|
|
* Additionally, this class provides various helper functions and variables
|
|
* related to longs.
|
|
*
|
|
* @author Paul Fisher
|
|
* @author John Keiser
|
|
* @author Warren Levy
|
|
* @author Eric Blake (ebb9@email.byu.edu)
|
|
* @author Tom Tromey (tromey@redhat.com)
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @author Ian Rogers
|
|
* @since 1.0
|
|
* @status updated to 1.5
|
|
*/
|
|
public final class Long extends Number implements Comparable<Long>
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.0.2+.
|
|
*/
|
|
private static final long serialVersionUID = 4290774380558885855L;
|
|
|
|
/**
|
|
* The minimum value a <code>long</code> can represent is
|
|
* -9223372036854775808L (or -2<sup>63</sup>).
|
|
*/
|
|
public static final long MIN_VALUE = 0x8000000000000000L;
|
|
|
|
/**
|
|
* The maximum value a <code>long</code> can represent is
|
|
* 9223372036854775807 (or 2<sup>63</sup> - 1).
|
|
*/
|
|
public static final long MAX_VALUE = 0x7fffffffffffffffL;
|
|
|
|
/**
|
|
* The primitive type <code>long</code> is represented by this
|
|
* <code>Class</code> object.
|
|
* @since 1.1
|
|
*/
|
|
public static final Class<Long> TYPE = (Class<Long>) VMClassLoader.getPrimitiveClass ('J');
|
|
|
|
/**
|
|
* The number of bits needed to represent a <code>long</code>.
|
|
* @since 1.5
|
|
*/
|
|
public static final int SIZE = 64;
|
|
|
|
// This caches some Long values, and is used by boxing
|
|
// conversions via valueOf(). We cache at least -128..127;
|
|
// these constants control how much we actually cache.
|
|
private static final int MIN_CACHE = -128;
|
|
private static final int MAX_CACHE = 127;
|
|
private static final Long[] longCache = new Long[MAX_CACHE - MIN_CACHE + 1];
|
|
static
|
|
{
|
|
for (int i=MIN_CACHE; i <= MAX_CACHE; i++)
|
|
longCache[i - MIN_CACHE] = new Long(i);
|
|
}
|
|
|
|
/**
|
|
* The immutable value of this Long.
|
|
*
|
|
* @serial the wrapped long
|
|
*/
|
|
private final long value;
|
|
|
|
/**
|
|
* Create a <code>Long</code> object representing the value of the
|
|
* <code>long</code> argument.
|
|
*
|
|
* @param value the value to use
|
|
*/
|
|
public Long(long value)
|
|
{
|
|
this.value = value;
|
|
}
|
|
|
|
/**
|
|
* Create a <code>Long</code> object representing the value of the
|
|
* argument after conversion to a <code>long</code>.
|
|
*
|
|
* @param s the string to convert
|
|
* @throws NumberFormatException if the String does not contain a long
|
|
* @see #valueOf(String)
|
|
*/
|
|
public Long(String s)
|
|
{
|
|
value = parseLong(s, 10, false);
|
|
}
|
|
|
|
/**
|
|
* Return the size of a string large enough to hold the given number
|
|
*
|
|
* @param num the number we want the string length for (must be positive)
|
|
* @param radix the radix (base) that will be used for the string
|
|
* @return a size sufficient for a string of num
|
|
*/
|
|
private static int stringSize(long num, int radix) {
|
|
int exp;
|
|
if (radix < 4)
|
|
{
|
|
exp = 1;
|
|
}
|
|
else if (radix < 8)
|
|
{
|
|
exp = 2;
|
|
}
|
|
else if (radix < 16)
|
|
{
|
|
exp = 3;
|
|
}
|
|
else if (radix < 32)
|
|
{
|
|
exp = 4;
|
|
}
|
|
else
|
|
{
|
|
exp = 5;
|
|
}
|
|
int size=0;
|
|
do
|
|
{
|
|
num >>>= exp;
|
|
size++;
|
|
}
|
|
while(num != 0);
|
|
return size;
|
|
}
|
|
|
|
/**
|
|
* Converts the <code>long</code> to a <code>String</code> using
|
|
* the specified radix (base). If the radix exceeds
|
|
* <code>Character.MIN_RADIX</code> or <code>Character.MAX_RADIX</code>, 10
|
|
* is used instead. If the result is negative, the leading character is
|
|
* '-' ('\\u002D'). The remaining characters come from
|
|
* <code>Character.forDigit(digit, radix)</code> ('0'-'9','a'-'z').
|
|
*
|
|
* @param num the <code>long</code> to convert to <code>String</code>
|
|
* @param radix the radix (base) to use in the conversion
|
|
* @return the <code>String</code> representation of the argument
|
|
*/
|
|
public static String toString(long num, int radix)
|
|
{
|
|
if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
|
|
radix = 10;
|
|
|
|
// Is the value negative?
|
|
boolean isNeg = num < 0;
|
|
|
|
// Is the string a single character?
|
|
if (!isNeg && num < radix)
|
|
return new String(digits, (int)num, 1, true);
|
|
|
|
// Compute string size and allocate buffer
|
|
// account for a leading '-' if the value is negative
|
|
int size;
|
|
int i;
|
|
char[] buffer;
|
|
if (isNeg)
|
|
{
|
|
num = -num;
|
|
|
|
// When the value is MIN_VALUE, it overflows when made positive
|
|
if (num < 0)
|
|
{
|
|
i = size = stringSize(MAX_VALUE, radix) + 2;
|
|
buffer = new char[size];
|
|
buffer[--i] = digits[(int) (-(num + radix) % radix)];
|
|
num = -(num / radix);
|
|
}
|
|
else
|
|
{
|
|
i = size = stringSize(num, radix) + 1;
|
|
buffer = new char[size];
|
|
}
|
|
}
|
|
else
|
|
{
|
|
i = size = stringSize(num, radix);
|
|
buffer = new char[size];
|
|
}
|
|
|
|
do
|
|
{
|
|
buffer[--i] = digits[(int) (num % radix)];
|
|
num /= radix;
|
|
}
|
|
while (num > 0);
|
|
|
|
if (isNeg)
|
|
buffer[--i] = '-';
|
|
|
|
// Package constructor avoids an array copy.
|
|
return new String(buffer, i, size - i, true);
|
|
}
|
|
|
|
/**
|
|
* Converts the <code>long</code> to a <code>String</code> assuming it is
|
|
* unsigned in base 16.
|
|
*
|
|
* @param l the <code>long</code> to convert to <code>String</code>
|
|
* @return the <code>String</code> representation of the argument
|
|
*/
|
|
public static String toHexString(long l)
|
|
{
|
|
return toUnsignedString(l, 4);
|
|
}
|
|
|
|
/**
|
|
* Converts the <code>long</code> to a <code>String</code> assuming it is
|
|
* unsigned in base 8.
|
|
*
|
|
* @param l the <code>long</code> to convert to <code>String</code>
|
|
* @return the <code>String</code> representation of the argument
|
|
*/
|
|
public static String toOctalString(long l)
|
|
{
|
|
return toUnsignedString(l, 3);
|
|
}
|
|
|
|
/**
|
|
* Converts the <code>long</code> to a <code>String</code> assuming it is
|
|
* unsigned in base 2.
|
|
*
|
|
* @param l the <code>long</code> to convert to <code>String</code>
|
|
* @return the <code>String</code> representation of the argument
|
|
*/
|
|
public static String toBinaryString(long l)
|
|
{
|
|
return toUnsignedString(l, 1);
|
|
}
|
|
|
|
/**
|
|
* Converts the <code>long</code> to a <code>String</code> and assumes
|
|
* a radix of 10.
|
|
*
|
|
* @param num the <code>long</code> to convert to <code>String</code>
|
|
* @return the <code>String</code> representation of the argument
|
|
* @see #toString(long, int)
|
|
*/
|
|
public static String toString(long num)
|
|
{
|
|
return toString(num, 10);
|
|
}
|
|
|
|
/**
|
|
* Converts the specified <code>String</code> into an <code>int</code>
|
|
* using the specified radix (base). The string must not be <code>null</code>
|
|
* or empty. It may begin with an optional '-', which will negate the answer,
|
|
* provided that there are also valid digits. Each digit is parsed as if by
|
|
* <code>Character.digit(d, radix)</code>, and must be in the range
|
|
* <code>0</code> to <code>radix - 1</code>. Finally, the result must be
|
|
* within <code>MIN_VALUE</code> to <code>MAX_VALUE</code>, inclusive.
|
|
* Unlike Double.parseDouble, you may not have a leading '+'; and 'l' or
|
|
* 'L' as the last character is only valid in radices 22 or greater, where
|
|
* it is a digit and not a type indicator.
|
|
*
|
|
* @param str the <code>String</code> to convert
|
|
* @param radix the radix (base) to use in the conversion
|
|
* @return the <code>String</code> argument converted to <code>long</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>long</code>
|
|
*/
|
|
public static long parseLong(String str, int radix)
|
|
{
|
|
return parseLong(str, radix, false);
|
|
}
|
|
|
|
/**
|
|
* Converts the specified <code>String</code> into a <code>long</code>.
|
|
* This function assumes a radix of 10.
|
|
*
|
|
* @param s the <code>String</code> to convert
|
|
* @return the <code>int</code> value of <code>s</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>long</code>
|
|
* @see #parseLong(String, int)
|
|
*/
|
|
public static long parseLong(String s)
|
|
{
|
|
return parseLong(s, 10, false);
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>Long</code> object using the <code>String</code>
|
|
* and specified radix (base).
|
|
*
|
|
* @param s the <code>String</code> to convert
|
|
* @param radix the radix (base) to convert with
|
|
* @return the new <code>Long</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>long</code>
|
|
* @see #parseLong(String, int)
|
|
*/
|
|
public static Long valueOf(String s, int radix)
|
|
{
|
|
return valueOf(parseLong(s, radix, false));
|
|
}
|
|
|
|
/**
|
|
* Creates a new <code>Long</code> object using the <code>String</code>,
|
|
* assuming a radix of 10.
|
|
*
|
|
* @param s the <code>String</code> to convert
|
|
* @return the new <code>Long</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>long</code>
|
|
* @see #Long(String)
|
|
* @see #parseLong(String)
|
|
*/
|
|
public static Long valueOf(String s)
|
|
{
|
|
return valueOf(parseLong(s, 10, false));
|
|
}
|
|
|
|
/**
|
|
* Returns a <code>Long</code> object wrapping the value.
|
|
*
|
|
* @param val the value to wrap
|
|
* @return the <code>Long</code>
|
|
* @since 1.5
|
|
*/
|
|
public static Long valueOf(long val)
|
|
{
|
|
if (val < MIN_CACHE || val > MAX_CACHE)
|
|
return new Long(val);
|
|
else
|
|
return longCache[((int)val) - MIN_CACHE];
|
|
}
|
|
|
|
/**
|
|
* Convert the specified <code>String</code> into a <code>Long</code>.
|
|
* The <code>String</code> may represent decimal, hexadecimal, or
|
|
* octal numbers.
|
|
*
|
|
* <p>The extended BNF grammar is as follows:<br>
|
|
* <pre>
|
|
* <em>DecodableString</em>:
|
|
* ( [ <code>-</code> ] <em>DecimalNumber</em> )
|
|
* | ( [ <code>-</code> ] ( <code>0x</code> | <code>0X</code>
|
|
* | <code>#</code> ) <em>HexDigit</em> { <em>HexDigit</em> } )
|
|
* | ( [ <code>-</code> ] <code>0</code> { <em>OctalDigit</em> } )
|
|
* <em>DecimalNumber</em>:
|
|
* <em>DecimalDigit except '0'</em> { <em>DecimalDigit</em> }
|
|
* <em>DecimalDigit</em>:
|
|
* <em>Character.digit(d, 10) has value 0 to 9</em>
|
|
* <em>OctalDigit</em>:
|
|
* <em>Character.digit(d, 8) has value 0 to 7</em>
|
|
* <em>DecimalDigit</em>:
|
|
* <em>Character.digit(d, 16) has value 0 to 15</em>
|
|
* </pre>
|
|
* Finally, the value must be in the range <code>MIN_VALUE</code> to
|
|
* <code>MAX_VALUE</code>, or an exception is thrown. Note that you cannot
|
|
* use a trailing 'l' or 'L', unlike in Java source code.
|
|
*
|
|
* @param str the <code>String</code> to interpret
|
|
* @return the value of the String as a <code>Long</code>
|
|
* @throws NumberFormatException if <code>s</code> cannot be parsed as a
|
|
* <code>long</code>
|
|
* @throws NullPointerException if <code>s</code> is null
|
|
* @since 1.2
|
|
*/
|
|
public static Long decode(String str)
|
|
{
|
|
return valueOf(parseLong(str, 10, true));
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Long</code> as a <code>byte</code>.
|
|
*
|
|
* @return the byte value
|
|
*/
|
|
public byte byteValue()
|
|
{
|
|
return (byte) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Long</code> as a <code>short</code>.
|
|
*
|
|
* @return the short value
|
|
*/
|
|
public short shortValue()
|
|
{
|
|
return (short) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Long</code> as an <code>int</code>.
|
|
*
|
|
* @return the int value
|
|
*/
|
|
public int intValue()
|
|
{
|
|
return (int) value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Long</code>.
|
|
*
|
|
* @return the long value
|
|
*/
|
|
public long longValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Long</code> as a <code>float</code>.
|
|
*
|
|
* @return the float value
|
|
*/
|
|
public float floatValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Return the value of this <code>Long</code> as a <code>double</code>.
|
|
*
|
|
* @return the double value
|
|
*/
|
|
public double doubleValue()
|
|
{
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Converts the <code>Long</code> value to a <code>String</code> and
|
|
* assumes a radix of 10.
|
|
*
|
|
* @return the <code>String</code> representation
|
|
*/
|
|
public String toString()
|
|
{
|
|
return toString(value, 10);
|
|
}
|
|
|
|
/**
|
|
* Return a hashcode representing this Object. <code>Long</code>'s hash
|
|
* code is calculated by <code>(int) (value ^ (value >> 32))</code>.
|
|
*
|
|
* @return this Object's hash code
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return (int) (value ^ (value >>> 32));
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> if <code>obj</code> is an instance of
|
|
* <code>Long</code> and represents the same long value.
|
|
*
|
|
* @param obj the object to compare
|
|
* @return whether these Objects are semantically equal
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
return obj instanceof Long && value == ((Long) obj).value;
|
|
}
|
|
|
|
/**
|
|
* Get the specified system property as a <code>Long</code>. The
|
|
* <code>decode()</code> method will be used to interpret the value of
|
|
* the property.
|
|
*
|
|
* @param nm the name of the system property
|
|
* @return the system property as a <code>Long</code>, or null if the
|
|
* property is not found or cannot be decoded
|
|
* @throws SecurityException if accessing the system property is forbidden
|
|
* @see System#getProperty(String)
|
|
* @see #decode(String)
|
|
*/
|
|
public static Long getLong(String nm)
|
|
{
|
|
return getLong(nm, null);
|
|
}
|
|
|
|
/**
|
|
* Get the specified system property as a <code>Long</code>, or use a
|
|
* default <code>long</code> value if the property is not found or is not
|
|
* decodable. The <code>decode()</code> method will be used to interpret
|
|
* the value of the property.
|
|
*
|
|
* @param nm the name of the system property
|
|
* @param val the default value
|
|
* @return the value of the system property, or the default
|
|
* @throws SecurityException if accessing the system property is forbidden
|
|
* @see System#getProperty(String)
|
|
* @see #decode(String)
|
|
*/
|
|
public static Long getLong(String nm, long val)
|
|
{
|
|
Long result = getLong(nm, null);
|
|
return result == null ? valueOf(val) : result;
|
|
}
|
|
|
|
/**
|
|
* Get the specified system property as a <code>Long</code>, or use a
|
|
* default <code>Long</code> value if the property is not found or is
|
|
* not decodable. The <code>decode()</code> method will be used to
|
|
* interpret the value of the property.
|
|
*
|
|
* @param nm the name of the system property
|
|
* @param def the default value
|
|
* @return the value of the system property, or the default
|
|
* @throws SecurityException if accessing the system property is forbidden
|
|
* @see System#getProperty(String)
|
|
* @see #decode(String)
|
|
*/
|
|
public static Long getLong(String nm, Long def)
|
|
{
|
|
if (nm == null || "".equals(nm))
|
|
return def;
|
|
nm = System.getProperty(nm);
|
|
if (nm == null)
|
|
return def;
|
|
try
|
|
{
|
|
return decode(nm);
|
|
}
|
|
catch (NumberFormatException e)
|
|
{
|
|
return def;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Compare two Longs numerically by comparing their <code>long</code>
|
|
* values. The result is positive if the first is greater, negative if the
|
|
* second is greater, and 0 if the two are equal.
|
|
*
|
|
* @param l the Long to compare
|
|
* @return the comparison
|
|
* @since 1.2
|
|
*/
|
|
public int compareTo(Long l)
|
|
{
|
|
if (value == l.value)
|
|
return 0;
|
|
// Returns just -1 or 1 on inequality; doing math might overflow the long.
|
|
return value > l.value ? 1 : -1;
|
|
}
|
|
|
|
/**
|
|
* Return the number of bits set in x.
|
|
* @param x value to examine
|
|
* @since 1.5
|
|
*/
|
|
public static int bitCount(long x)
|
|
{
|
|
// Successively collapse alternating bit groups into a sum.
|
|
x = ((x >> 1) & 0x5555555555555555L) + (x & 0x5555555555555555L);
|
|
x = ((x >> 2) & 0x3333333333333333L) + (x & 0x3333333333333333L);
|
|
int v = (int) ((x >>> 32) + x);
|
|
v = ((v >> 4) & 0x0f0f0f0f) + (v & 0x0f0f0f0f);
|
|
v = ((v >> 8) & 0x00ff00ff) + (v & 0x00ff00ff);
|
|
return ((v >> 16) & 0x0000ffff) + (v & 0x0000ffff);
|
|
}
|
|
|
|
/**
|
|
* Rotate x to the left by distance bits.
|
|
* @param x the value to rotate
|
|
* @param distance the number of bits by which to rotate
|
|
* @since 1.5
|
|
*/
|
|
public static long rotateLeft(long x, int distance)
|
|
{
|
|
// This trick works because the shift operators implicitly mask
|
|
// the shift count.
|
|
return (x << distance) | (x >>> - distance);
|
|
}
|
|
|
|
/**
|
|
* Rotate x to the right by distance bits.
|
|
* @param x the value to rotate
|
|
* @param distance the number of bits by which to rotate
|
|
* @since 1.5
|
|
*/
|
|
public static long rotateRight(long x, int distance)
|
|
{
|
|
// This trick works because the shift operators implicitly mask
|
|
// the shift count.
|
|
return (x << - distance) | (x >>> distance);
|
|
}
|
|
|
|
/**
|
|
* Find the highest set bit in value, and return a new value
|
|
* with only that bit set.
|
|
* @param value the value to examine
|
|
* @since 1.5
|
|
*/
|
|
public static long highestOneBit(long value)
|
|
{
|
|
value |= value >>> 1;
|
|
value |= value >>> 2;
|
|
value |= value >>> 4;
|
|
value |= value >>> 8;
|
|
value |= value >>> 16;
|
|
value |= value >>> 32;
|
|
return value ^ (value >>> 1);
|
|
}
|
|
|
|
/**
|
|
* Return the number of leading zeros in value.
|
|
* @param value the value to examine
|
|
* @since 1.5
|
|
*/
|
|
public static int numberOfLeadingZeros(long value)
|
|
{
|
|
value |= value >>> 1;
|
|
value |= value >>> 2;
|
|
value |= value >>> 4;
|
|
value |= value >>> 8;
|
|
value |= value >>> 16;
|
|
value |= value >>> 32;
|
|
return bitCount(~value);
|
|
}
|
|
|
|
/**
|
|
* Find the lowest set bit in value, and return a new value
|
|
* with only that bit set.
|
|
* @param value the value to examine
|
|
* @since 1.5
|
|
*/
|
|
public static long lowestOneBit(long value)
|
|
{
|
|
// Classic assembly trick.
|
|
return value & - value;
|
|
}
|
|
|
|
/**
|
|
* Find the number of trailing zeros in value.
|
|
* @param value the value to examine
|
|
* @since 1.5
|
|
*/
|
|
public static int numberOfTrailingZeros(long value)
|
|
{
|
|
return bitCount((value & -value) - 1);
|
|
}
|
|
|
|
/**
|
|
* Return 1 if x is positive, -1 if it is negative, and 0 if it is
|
|
* zero.
|
|
* @param x the value to examine
|
|
* @since 1.5
|
|
*/
|
|
public static int signum(long x)
|
|
{
|
|
return (int) ((x >> 63) | (-x >>> 63));
|
|
|
|
// The LHS propagates the sign bit through every bit in the word;
|
|
// if X < 0, every bit is set to 1, else 0. if X > 0, the RHS
|
|
// negates x and shifts the resulting 1 in the sign bit to the
|
|
// LSB, leaving every other bit 0.
|
|
|
|
// Hacker's Delight, Section 2-7
|
|
}
|
|
|
|
/**
|
|
* Reverse the bytes in val.
|
|
* @since 1.5
|
|
*/
|
|
public static long reverseBytes(long val)
|
|
{
|
|
int hi = Integer.reverseBytes((int) val);
|
|
int lo = Integer.reverseBytes((int) (val >>> 32));
|
|
return (((long) hi) << 32) | lo;
|
|
}
|
|
|
|
/**
|
|
* Reverse the bits in val.
|
|
* @since 1.5
|
|
*/
|
|
public static long reverse(long val)
|
|
{
|
|
long hi = Integer.reverse((int) val) & 0xffffffffL;
|
|
long lo = Integer.reverse((int) (val >>> 32)) & 0xffffffffL;
|
|
return (hi << 32) | lo;
|
|
}
|
|
|
|
/**
|
|
* Helper for converting unsigned numbers to String.
|
|
*
|
|
* @param num the number
|
|
* @param exp log2(digit) (ie. 1, 3, or 4 for binary, oct, hex)
|
|
*/
|
|
private static String toUnsignedString(long num, int exp)
|
|
{
|
|
// Compute string length
|
|
int size = 1;
|
|
long copy = num >>> exp;
|
|
while (copy != 0)
|
|
{
|
|
size++;
|
|
copy >>>= exp;
|
|
}
|
|
// Quick path for single character strings
|
|
if (size == 1)
|
|
return new String(digits, (int)num, 1, true);
|
|
|
|
// Encode into buffer
|
|
int mask = (1 << exp) - 1;
|
|
char[] buffer = new char[size];
|
|
int i = size;
|
|
do
|
|
{
|
|
buffer[--i] = digits[(int) num & mask];
|
|
num >>>= exp;
|
|
}
|
|
while (num != 0);
|
|
|
|
// Package constructor avoids an array copy.
|
|
return new String(buffer, i, size - i, true);
|
|
}
|
|
|
|
/**
|
|
* Helper for parsing longs.
|
|
*
|
|
* @param str the string to parse
|
|
* @param radix the radix to use, must be 10 if decode is true
|
|
* @param decode if called from decode
|
|
* @return the parsed long value
|
|
* @throws NumberFormatException if there is an error
|
|
* @throws NullPointerException if decode is true and str is null
|
|
* @see #parseLong(String, int)
|
|
* @see #decode(String)
|
|
*/
|
|
private static long parseLong(String str, int radix, boolean decode)
|
|
{
|
|
if (! decode && str == null)
|
|
throw new NumberFormatException();
|
|
int index = 0;
|
|
int len = str.length();
|
|
boolean isNeg = false;
|
|
if (len == 0)
|
|
throw new NumberFormatException();
|
|
int ch = str.charAt(index);
|
|
if (ch == '-')
|
|
{
|
|
if (len == 1)
|
|
throw new NumberFormatException();
|
|
isNeg = true;
|
|
ch = str.charAt(++index);
|
|
}
|
|
if (decode)
|
|
{
|
|
if (ch == '0')
|
|
{
|
|
if (++index == len)
|
|
return 0;
|
|
if ((str.charAt(index) & ~('x' ^ 'X')) == 'X')
|
|
{
|
|
radix = 16;
|
|
index++;
|
|
}
|
|
else
|
|
radix = 8;
|
|
}
|
|
else if (ch == '#')
|
|
{
|
|
radix = 16;
|
|
index++;
|
|
}
|
|
}
|
|
if (index == len)
|
|
throw new NumberFormatException();
|
|
|
|
long max = MAX_VALUE / radix;
|
|
// We can't directly write `max = (MAX_VALUE + 1) / radix'.
|
|
// So instead we fake it.
|
|
if (isNeg && MAX_VALUE % radix == radix - 1)
|
|
++max;
|
|
|
|
long val = 0;
|
|
while (index < len)
|
|
{
|
|
if (val < 0 || val > max)
|
|
throw new NumberFormatException();
|
|
|
|
ch = Character.digit(str.charAt(index++), radix);
|
|
val = val * radix + ch;
|
|
if (ch < 0 || (val < 0 && (! isNeg || val != MIN_VALUE)))
|
|
throw new NumberFormatException();
|
|
}
|
|
return isNeg ? -val : val;
|
|
}
|
|
}
|