re PR libgcj/37636 (java tools are unable to find resource files)
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
This commit is contained in:
Matthias Klose
parent
d9cc481a35
commit
cd6d4007aa
2325 changed files with 121399 additions and 23635 deletions
|
|
@ -38,12 +38,17 @@ exception statement from your version. */
|
|||
|
||||
package java.math;
|
||||
|
||||
import gnu.classpath.Configuration;
|
||||
|
||||
import gnu.java.lang.CPStringBuilder;
|
||||
import gnu.java.math.GMP;
|
||||
import gnu.java.math.MPN;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.util.Random;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* Written using on-line Java Platform 1.2 API Specification, as well
|
||||
|
|
@ -59,6 +64,8 @@ import java.util.Random;
|
|||
*/
|
||||
public class BigInteger extends Number implements Comparable<BigInteger>
|
||||
{
|
||||
private static final Logger log = Logger.getLogger(BigInteger.class.getName());
|
||||
|
||||
/** All integers are stored in 2's-complement form.
|
||||
* If words == null, the ival is the value of this BigInteger.
|
||||
* Otherwise, the first ival elements of words make the value
|
||||
|
|
@ -67,9 +74,10 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
private transient int[] words;
|
||||
|
||||
// Serialization fields.
|
||||
// the first three, although not used in the code, are present for
|
||||
// compatibility with older RI versions of this class. DO NOT REMOVE.
|
||||
private int bitCount = -1;
|
||||
private int bitLength = -1;
|
||||
private int firstNonzeroByteNum = -2;
|
||||
private int lowestSetBit = -2;
|
||||
private byte[] magnitude;
|
||||
private int signum;
|
||||
|
|
@ -81,31 +89,52 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
private static final int minFixNum = -100;
|
||||
private static final int maxFixNum = 1024;
|
||||
private static final int numFixNum = maxFixNum-minFixNum+1;
|
||||
private static final BigInteger[] smallFixNums = new BigInteger[numFixNum];
|
||||
private static final BigInteger[] smallFixNums;
|
||||
|
||||
/** The alter-ego GMP instance for this. */
|
||||
private transient GMP mpz;
|
||||
|
||||
private static final boolean USING_NATIVE = Configuration.WANT_NATIVE_BIG_INTEGER
|
||||
&& initializeLibrary();
|
||||
|
||||
static
|
||||
{
|
||||
for (int i = numFixNum; --i >= 0; )
|
||||
smallFixNums[i] = new BigInteger(i + minFixNum);
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
smallFixNums = null;
|
||||
ZERO = valueOf(0L);
|
||||
ONE = valueOf(1L);
|
||||
TEN = valueOf(10L);
|
||||
}
|
||||
else
|
||||
{
|
||||
smallFixNums = new BigInteger[numFixNum];
|
||||
for (int i = numFixNum; --i >= 0; )
|
||||
smallFixNums[i] = new BigInteger(i + minFixNum);
|
||||
|
||||
ZERO = smallFixNums[-minFixNum];
|
||||
ONE = smallFixNums[1 - minFixNum];
|
||||
TEN = smallFixNums[10 - minFixNum];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The constant zero as a BigInteger.
|
||||
* @since 1.2
|
||||
*/
|
||||
public static final BigInteger ZERO = smallFixNums[0 - minFixNum];
|
||||
public static final BigInteger ZERO;
|
||||
|
||||
/**
|
||||
* The constant one as a BigInteger.
|
||||
* @since 1.2
|
||||
*/
|
||||
public static final BigInteger ONE = smallFixNums[1 - minFixNum];
|
||||
public static final BigInteger ONE;
|
||||
|
||||
/**
|
||||
* The constant ten as a BigInteger.
|
||||
* @since 1.5
|
||||
*/
|
||||
public static final BigInteger TEN = smallFixNums[10 - minFixNum];
|
||||
public static final BigInteger TEN;
|
||||
|
||||
/* Rounding modes: */
|
||||
private static final int FLOOR = 1;
|
||||
|
|
@ -130,19 +159,72 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
private BigInteger()
|
||||
{
|
||||
super();
|
||||
|
||||
if (USING_NATIVE)
|
||||
mpz = new GMP();
|
||||
}
|
||||
|
||||
/* Create a new (non-shared) BigInteger, and initialize to an int. */
|
||||
private BigInteger(int value)
|
||||
{
|
||||
super();
|
||||
|
||||
ival = value;
|
||||
}
|
||||
|
||||
public BigInteger(String val, int radix)
|
||||
public BigInteger(String s, int radix)
|
||||
{
|
||||
BigInteger result = valueOf(val, radix);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
this();
|
||||
|
||||
int len = s.length();
|
||||
int i, digit;
|
||||
boolean negative;
|
||||
byte[] bytes;
|
||||
char ch = s.charAt(0);
|
||||
if (ch == '-')
|
||||
{
|
||||
negative = true;
|
||||
i = 1;
|
||||
bytes = new byte[len - 1];
|
||||
}
|
||||
else
|
||||
{
|
||||
negative = false;
|
||||
i = 0;
|
||||
bytes = new byte[len];
|
||||
}
|
||||
int byte_len = 0;
|
||||
for ( ; i < len; i++)
|
||||
{
|
||||
ch = s.charAt(i);
|
||||
digit = Character.digit(ch, radix);
|
||||
if (digit < 0)
|
||||
throw new NumberFormatException("Invalid character at position #" + i);
|
||||
bytes[byte_len++] = (byte) digit;
|
||||
}
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
bytes = null;
|
||||
if (mpz.fromString(s, radix) != 0)
|
||||
throw new NumberFormatException("String \"" + s
|
||||
+ "\" is NOT a valid number in base "
|
||||
+ radix);
|
||||
}
|
||||
else
|
||||
{
|
||||
BigInteger result;
|
||||
// Testing (len < MPN.chars_per_word(radix)) would be more accurate,
|
||||
// but slightly more expensive, for little practical gain.
|
||||
if (len <= 15 && radix <= 16)
|
||||
result = valueOf(Long.parseLong(s, radix));
|
||||
else
|
||||
result = valueOf(bytes, byte_len, negative, radix);
|
||||
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
}
|
||||
}
|
||||
|
||||
public BigInteger(String val)
|
||||
|
|
@ -153,17 +235,26 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
/* Create a new (non-shared) BigInteger, and initialize from a byte array. */
|
||||
public BigInteger(byte[] val)
|
||||
{
|
||||
this();
|
||||
|
||||
if (val == null || val.length < 1)
|
||||
throw new NumberFormatException();
|
||||
|
||||
words = byteArrayToIntArray(val, val[0] < 0 ? -1 : 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
if (USING_NATIVE)
|
||||
mpz.fromByteArray(val);
|
||||
else
|
||||
{
|
||||
words = byteArrayToIntArray(val, val[0] < 0 ? -1 : 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
}
|
||||
}
|
||||
|
||||
public BigInteger(int signum, byte[] magnitude)
|
||||
{
|
||||
this();
|
||||
|
||||
if (magnitude == null || signum > 1 || signum < -1)
|
||||
throw new NumberFormatException();
|
||||
|
||||
|
|
@ -177,18 +268,25 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
return;
|
||||
}
|
||||
|
||||
// Magnitude is always positive, so don't ever pass a sign of -1.
|
||||
words = byteArrayToIntArray(magnitude, 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
if (USING_NATIVE)
|
||||
mpz.fromSignedMagnitude(magnitude, signum == -1);
|
||||
else
|
||||
{
|
||||
// Magnitude is always positive, so don't ever pass a sign of -1.
|
||||
words = byteArrayToIntArray(magnitude, 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
|
||||
if (signum < 0)
|
||||
setNegative();
|
||||
if (signum < 0)
|
||||
setNegative();
|
||||
}
|
||||
}
|
||||
|
||||
public BigInteger(int numBits, Random rnd)
|
||||
{
|
||||
this();
|
||||
|
||||
if (numBits < 0)
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
|
|
@ -197,6 +295,22 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
private void init(int numBits, Random rnd)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int length = (numBits + 7) / 8;
|
||||
byte[] magnitude = new byte[length];
|
||||
rnd.nextBytes(magnitude);
|
||||
int discardedBitCount = numBits % 8;
|
||||
if (discardedBitCount != 0)
|
||||
{
|
||||
discardedBitCount = 8 - discardedBitCount;
|
||||
magnitude[0] = (byte)((magnitude[0] & 0xFF) >>> discardedBitCount);
|
||||
}
|
||||
mpz.fromSignedMagnitude(magnitude, false);
|
||||
magnitude = null;
|
||||
return;
|
||||
}
|
||||
|
||||
int highbits = numBits & 31;
|
||||
// minimum number of bytes to store the above number of bits
|
||||
int highBitByteCount = (highbits + 7) / 8;
|
||||
|
|
@ -235,20 +349,23 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger(int bitLength, int certainty, Random rnd)
|
||||
{
|
||||
this(bitLength, rnd);
|
||||
this();
|
||||
|
||||
// Keep going until we find a probable prime.
|
||||
BigInteger result;
|
||||
BigInteger result = new BigInteger();
|
||||
while (true)
|
||||
{
|
||||
// ...but first ensure that BI has bitLength bits
|
||||
result = setBit(bitLength - 1);
|
||||
result.init(bitLength, rnd);
|
||||
result = result.setBit(bitLength - 1);
|
||||
if (result.isProbablePrime(certainty))
|
||||
break;
|
||||
}
|
||||
|
||||
if (USING_NATIVE)
|
||||
mpz.fromBI(result.mpz);
|
||||
else
|
||||
{
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
if (isProbablePrime(certainty))
|
||||
return;
|
||||
|
||||
init(bitLength, rnd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -272,6 +389,13 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
/** Return a (possibly-shared) BigInteger with a given long value. */
|
||||
public static BigInteger valueOf(long val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
result.mpz.fromLong(val);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (val >= minFixNum && val <= maxFixNum)
|
||||
return smallFixNums[(int) val - minFixNum];
|
||||
int i = (int) val;
|
||||
|
|
@ -284,6 +408,31 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return <code>true</code> if the GMP-based native implementation library
|
||||
* was successfully loaded. Returns <code>false</code> otherwise.
|
||||
*/
|
||||
private static boolean initializeLibrary()
|
||||
{
|
||||
boolean result;
|
||||
try
|
||||
{
|
||||
System.loadLibrary("javamath");
|
||||
GMP.natInitializeLibrary();
|
||||
result = true;
|
||||
}
|
||||
catch (Throwable x)
|
||||
{
|
||||
result = false;
|
||||
if (Configuration.DEBUG)
|
||||
{
|
||||
log.info("Unable to use native BigInteger: " + x);
|
||||
log.info("Will use a pure Java implementation instead");
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Make a canonicalized BigInteger from an array of words.
|
||||
* The array may be reused (without copying). */
|
||||
private static BigInteger make(int[] words, int len)
|
||||
|
|
@ -374,6 +523,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public int signum()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return mpz.compare(ZERO.mpz);
|
||||
|
||||
if (ival == 0 && words == null)
|
||||
return 0;
|
||||
int top = words == null ? ival : words[ival-1];
|
||||
|
|
@ -382,6 +534,12 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
private static int compareTo(BigInteger x, BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
return x.mpz.compare(y.mpz);
|
||||
}
|
||||
|
||||
if (x.words == null && y.words == null)
|
||||
return x.ival < y.ival ? -1 : x.ival > y.ival ? 1 : 0;
|
||||
boolean x_negative = x.isNegative();
|
||||
|
|
@ -586,11 +744,27 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger add(BigInteger val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = val.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.add(val.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return add(this, val, 1);
|
||||
}
|
||||
|
||||
public BigInteger subtract(BigInteger val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = val.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.subtract(val.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return add(this, val, -1);
|
||||
}
|
||||
|
||||
|
|
@ -672,6 +846,14 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger multiply(BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.multiply(y.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return times(this, y);
|
||||
}
|
||||
|
||||
|
|
@ -947,6 +1129,16 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger divide(BigInteger val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
if (val.compareTo(ZERO) == 0)
|
||||
throw new ArithmeticException("divisor is zero");
|
||||
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.quotient(val.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (val.isZero())
|
||||
throw new ArithmeticException("divisor is zero");
|
||||
|
||||
|
|
@ -957,6 +1149,16 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger remainder(BigInteger val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
if (val.compareTo(ZERO) == 0)
|
||||
throw new ArithmeticException("divisor is zero");
|
||||
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.remainder(val.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (val.isZero())
|
||||
throw new ArithmeticException("divisor is zero");
|
||||
|
||||
|
|
@ -967,6 +1169,17 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger[] divideAndRemainder(BigInteger val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
if (val.compareTo(ZERO) == 0)
|
||||
throw new ArithmeticException("divisor is zero");
|
||||
|
||||
BigInteger q = new BigInteger();
|
||||
BigInteger r = new BigInteger();
|
||||
mpz.quotientAndRemainder(val.mpz, q.mpz, r.mpz);
|
||||
return new BigInteger[] { q, r };
|
||||
}
|
||||
|
||||
if (val.isZero())
|
||||
throw new ArithmeticException("divisor is zero");
|
||||
|
||||
|
|
@ -981,6 +1194,17 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger mod(BigInteger m)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = m.signum; // force NPE check
|
||||
if (m.compareTo(ZERO) < 1)
|
||||
throw new ArithmeticException("non-positive modulus");
|
||||
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.modulo(m.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (m.isNegative() || m.isZero())
|
||||
throw new ArithmeticException("non-positive modulus");
|
||||
|
||||
|
|
@ -1000,6 +1224,14 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
return ONE;
|
||||
throw new ArithmeticException("negative exponent");
|
||||
}
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.pow(exponent, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (isZero())
|
||||
return this;
|
||||
int plen = words == null ? 1 : ival; // Length of pow2.
|
||||
|
|
@ -1097,6 +1329,17 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger modInverse(BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
if (mpz.compare(ZERO.mpz) < 1)
|
||||
throw new ArithmeticException("non-positive modulo");
|
||||
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.modInverse(y.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (y.isNegative() || y.isZero())
|
||||
throw new ArithmeticException("non-positive modulo");
|
||||
|
||||
|
|
@ -1175,6 +1418,17 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger modPow(BigInteger exponent, BigInteger m)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = exponent.signum; // force NPE check
|
||||
if (m.mpz.compare(ZERO.mpz) < 1)
|
||||
throw new ArithmeticException("non-positive modulo");
|
||||
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.modPow(exponent.mpz, m.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (m.isNegative() || m.isZero())
|
||||
throw new ArithmeticException("non-positive modulo");
|
||||
|
||||
|
|
@ -1228,6 +1482,14 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger gcd(BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.gcd(y.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
int xval = ival;
|
||||
int yval = y.ival;
|
||||
if (words == null)
|
||||
|
|
@ -1281,6 +1543,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
if (certainty < 1)
|
||||
return true;
|
||||
|
||||
if (USING_NATIVE)
|
||||
return mpz.testPrimality(certainty) != 0;
|
||||
|
||||
/** We'll use the Rabin-Miller algorithm for doing a probabilistic
|
||||
* primality test. It is fast, easy and has faster decreasing odds of a
|
||||
* composite passing than with other tests. This means that this
|
||||
|
|
@ -1460,15 +1725,41 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger shiftLeft(int n)
|
||||
{
|
||||
if (n == 0)
|
||||
return this;
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
if (n < 0)
|
||||
mpz.shiftRight(-n, result.mpz);
|
||||
else
|
||||
mpz.shiftLeft(n, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return shift(this, n);
|
||||
}
|
||||
|
||||
public BigInteger shiftRight(int n)
|
||||
{
|
||||
if (n == 0)
|
||||
return this;
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
if (n < 0)
|
||||
mpz.shiftLeft(-n, result.mpz);
|
||||
else
|
||||
mpz.shiftRight(n, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return shift(this, -n);
|
||||
}
|
||||
|
||||
private void format(int radix, StringBuffer buffer)
|
||||
private void format(int radix, CPStringBuilder buffer)
|
||||
{
|
||||
if (words == null)
|
||||
buffer.append(Integer.toString(ival, radix));
|
||||
|
|
@ -1537,18 +1828,27 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public String toString(int radix)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return mpz.toString(radix);
|
||||
|
||||
if (words == null)
|
||||
return Integer.toString(ival, radix);
|
||||
if (ival <= 2)
|
||||
return Long.toString(longValue(), radix);
|
||||
int buf_size = ival * (MPN.chars_per_word(radix) + 1);
|
||||
StringBuffer buffer = new StringBuffer(buf_size);
|
||||
CPStringBuilder buffer = new CPStringBuilder(buf_size);
|
||||
format(radix, buffer);
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
public int intValue()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int result = mpz.absIntValue();
|
||||
return mpz.compare(ZERO.mpz) < 0 ? - result : result;
|
||||
}
|
||||
|
||||
if (words == null)
|
||||
return ival;
|
||||
return words[0];
|
||||
|
|
@ -1556,6 +1856,15 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public long longValue()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
long result;
|
||||
result = (abs().shiftRight(32)).mpz.absIntValue();
|
||||
result <<= 32;
|
||||
result |= mpz.absIntValue() & 0xFFFFFFFFL;
|
||||
return this.compareTo(ZERO) < 0 ? - result : result;
|
||||
}
|
||||
|
||||
if (words == null)
|
||||
return ival;
|
||||
if (ival == 1)
|
||||
|
|
@ -1566,12 +1875,25 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
public int hashCode()
|
||||
{
|
||||
// FIXME: May not match hashcode of JDK.
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
// TODO: profile to decide whether to make it native
|
||||
byte[] bytes = this.toByteArray();
|
||||
int result = 0;
|
||||
for (int i = 0; i < bytes.length; i++)
|
||||
result ^= (bytes[i] & 0xFF) << (8 * (i % 4));
|
||||
return result;
|
||||
}
|
||||
|
||||
return words == null ? ival : (words[0] + words[ival - 1]);
|
||||
}
|
||||
|
||||
/* Assumes x and y are both canonicalized. */
|
||||
private static boolean equals(BigInteger x, BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return x.mpz.compare(y.mpz) == 0;
|
||||
|
||||
if (x.words == null && y.words == null)
|
||||
return x.ival == y.ival;
|
||||
if (x.words == null || y.words == null || x.ival != y.ival)
|
||||
|
|
@ -1592,43 +1914,6 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
return equals(this, (BigInteger) obj);
|
||||
}
|
||||
|
||||
private static BigInteger valueOf(String s, int radix)
|
||||
throws NumberFormatException
|
||||
{
|
||||
int len = s.length();
|
||||
// Testing (len < MPN.chars_per_word(radix)) would be more accurate,
|
||||
// but slightly more expensive, for little practical gain.
|
||||
if (len <= 15 && radix <= 16)
|
||||
return valueOf(Long.parseLong(s, radix));
|
||||
|
||||
int i, digit;
|
||||
boolean negative;
|
||||
byte[] bytes;
|
||||
char ch = s.charAt(0);
|
||||
if (ch == '-')
|
||||
{
|
||||
negative = true;
|
||||
i = 1;
|
||||
bytes = new byte[len - 1];
|
||||
}
|
||||
else
|
||||
{
|
||||
negative = false;
|
||||
i = 0;
|
||||
bytes = new byte[len];
|
||||
}
|
||||
int byte_len = 0;
|
||||
for ( ; i < len; i++)
|
||||
{
|
||||
ch = s.charAt(i);
|
||||
digit = Character.digit(ch, radix);
|
||||
if (digit < 0)
|
||||
throw new NumberFormatException();
|
||||
bytes[byte_len++] = (byte) digit;
|
||||
}
|
||||
return valueOf(bytes, byte_len, negative, radix);
|
||||
}
|
||||
|
||||
private static BigInteger valueOf(byte[] digits, int byte_len,
|
||||
boolean negative, int radix)
|
||||
{
|
||||
|
|
@ -1646,6 +1931,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public double doubleValue()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return mpz.doubleValue();
|
||||
|
||||
if (words == null)
|
||||
return (double) ival;
|
||||
if (ival <= 2)
|
||||
|
|
@ -1827,6 +2115,13 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger abs()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.abs(result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return abs(this);
|
||||
}
|
||||
|
||||
|
|
@ -1841,6 +2136,13 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public BigInteger negate()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.negate(result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return neg(this);
|
||||
}
|
||||
|
||||
|
|
@ -1849,6 +2151,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
*/
|
||||
public int bitLength()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return mpz.bitLength();
|
||||
|
||||
if (words == null)
|
||||
return MPN.intLength(ival);
|
||||
return MPN.intLength(words, ival);
|
||||
|
|
@ -1856,6 +2161,25 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
|
||||
public byte[] toByteArray()
|
||||
{
|
||||
if (signum() == 0)
|
||||
return new byte[1];
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
// the minimal number of bytes required to represent the MPI is function
|
||||
// of (a) its bit-length, and (b) its sign. only when this MPI is both
|
||||
// positive, and its bit-length is a multiple of 8 do we add one zero
|
||||
// bit for its sign. we do this so if we construct a new MPI from the
|
||||
// resulting byte array, we wouldn't mistake a positive number, whose
|
||||
// bit-length is a multiple of 8, for a similar-length negative one.
|
||||
int bits = bitLength();
|
||||
if (bits % 8 == 0 || this.signum() == 1)
|
||||
bits++;
|
||||
byte[] bytes = new byte[(bits + 7) / 8];
|
||||
mpz.toByteArray(bytes);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
// Determine number of bytes needed. The method bitlength returns
|
||||
// the size without the sign bit, so add one bit for that and then
|
||||
// add 7 more to emulate the ceil function using integer math.
|
||||
|
|
@ -2112,6 +2436,14 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
/** Return the logical (bit-wise) "and" of two BigIntegers. */
|
||||
public BigInteger and(BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.and(y.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
if (y.words == null)
|
||||
return and(this, y.ival);
|
||||
else if (words == null)
|
||||
|
|
@ -2135,23 +2467,54 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
/** Return the logical (bit-wise) "(inclusive) or" of two BigIntegers. */
|
||||
public BigInteger or(BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.or(y.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return bitOp(7, this, y);
|
||||
}
|
||||
|
||||
/** Return the logical (bit-wise) "exclusive or" of two BigIntegers. */
|
||||
public BigInteger xor(BigInteger y)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = y.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.xor(y.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return bitOp(6, this, y);
|
||||
}
|
||||
|
||||
/** Return the logical (bit-wise) negation of a BigInteger. */
|
||||
public BigInteger not()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.not(result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return bitOp(12, this, ZERO);
|
||||
}
|
||||
|
||||
public BigInteger andNot(BigInteger val)
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
int dummy = val.signum; // force NPE check
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.andNot(val.mpz, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return and(val.not());
|
||||
}
|
||||
|
||||
|
|
@ -2160,6 +2523,13 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
if (n < 0)
|
||||
throw new ArithmeticException();
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.setBit(n, false, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return and(ONE.shiftLeft(n).not());
|
||||
}
|
||||
|
||||
|
|
@ -2168,6 +2538,13 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
if (n < 0)
|
||||
throw new ArithmeticException();
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.setBit(n, true, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return or(ONE.shiftLeft(n));
|
||||
}
|
||||
|
||||
|
|
@ -2176,6 +2553,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
if (n < 0)
|
||||
throw new ArithmeticException();
|
||||
|
||||
if (USING_NATIVE)
|
||||
return mpz.testBit(n) != 0;
|
||||
|
||||
return !and(ONE.shiftLeft(n)).isZero();
|
||||
}
|
||||
|
||||
|
|
@ -2184,11 +2564,21 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
if (n < 0)
|
||||
throw new ArithmeticException();
|
||||
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
BigInteger result = new BigInteger();
|
||||
mpz.flipBit(n, result.mpz);
|
||||
return result;
|
||||
}
|
||||
|
||||
return xor(ONE.shiftLeft(n));
|
||||
}
|
||||
|
||||
public int getLowestSetBit()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return mpz.compare(ZERO.mpz) == 0 ? -1 : mpz.lowestSetBit();
|
||||
|
||||
if (isZero())
|
||||
return -1;
|
||||
|
||||
|
|
@ -2225,6 +2615,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
* If argument is negative, count zero bits instead. */
|
||||
public int bitCount()
|
||||
{
|
||||
if (USING_NATIVE)
|
||||
return mpz.bitCount();
|
||||
|
||||
int i, x_len;
|
||||
int[] x_words = words;
|
||||
if (x_words == null)
|
||||
|
|
@ -2243,19 +2636,30 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
private void readObject(ObjectInputStream s)
|
||||
throws IOException, ClassNotFoundException
|
||||
{
|
||||
s.defaultReadObject();
|
||||
if (magnitude.length == 0 || signum == 0)
|
||||
if (USING_NATIVE)
|
||||
{
|
||||
this.ival = 0;
|
||||
this.words = null;
|
||||
mpz = new GMP();
|
||||
s.defaultReadObject();
|
||||
if (signum != 0)
|
||||
mpz.fromByteArray(magnitude);
|
||||
// else it's zero and we need to do nothing
|
||||
}
|
||||
else
|
||||
{
|
||||
words = byteArrayToIntArray(magnitude, signum < 0 ? -1 : 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
}
|
||||
s.defaultReadObject();
|
||||
if (magnitude.length == 0 || signum == 0)
|
||||
{
|
||||
this.ival = 0;
|
||||
this.words = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
words = byteArrayToIntArray(magnitude, signum < 0 ? -1 : 0);
|
||||
BigInteger result = make(words, words.length);
|
||||
this.ival = result.ival;
|
||||
this.words = result.words;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void writeObject(ObjectOutputStream s)
|
||||
|
|
@ -2264,5 +2668,9 @@ public class BigInteger extends Number implements Comparable<BigInteger>
|
|||
signum = signum();
|
||||
magnitude = signum == 0 ? new byte[0] : toByteArray();
|
||||
s.defaultWriteObject();
|
||||
magnitude = null; // not needed anymore
|
||||
}
|
||||
|
||||
// inner class(es) ..........................................................
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue