OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natString.cc (substring): optimize where substring is entire String. 

1999-07-22  Bryce McKinlay  <bryce@albatross.co.nz>

	* java/lang/natString.cc (substring): optimize where substring is
	entire String.
	* java/io/File.java (getName): don't return separator with file name.
	* java/io/natFile.cc (attr): fix overflow.

From-SVN: r28246
This commit is contained in:
Bryce McKinlay 1999-07-26 02:51:44 +00:00 committed by Bryce McKinlay
parent 648d2ffce8
commit 41296e2a23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
1999-07-22 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/natString.cc (substring): optimize where substring is
entire String.
* java/io/File.java (getName): don't return separator with file name.
* java/io/natFile.cc (attr): fix overflow.
Sun Jul 25 01:43:34 1999 Anthony Green <green@cygnus.com>
* mauve-libgcj: Disable Object Serialization tests.

4
libjava/java/io/File.java
View File

@ -108,9 +108,7 @@ public class File implements Serializable
public String getName ()
{
int last = path.lastIndexOf(separatorChar);
if (last == -1)
last = 0;
return path.substring(last);
return path.substring(last + 1);
}
public String getParent ()

2
libjava/java/io/natFile.cc
View File

@ -105,7 +105,7 @@ java::io::File::attr (jstring canon, jint query)
JvAssert (query == MODIFIED || query == LENGTH);
// FIXME: time computation is very POSIX-specific -- POSIX and Java
// have the same Epoch.
return query == MODIFIED ? sb.st_mtime * 1000 : sb.st_size;
return query == MODIFIED ? (jlong)sb.st_mtime * 1000 : sb.st_size;
#else
// There's no good choice here.
return 23;

2
libjava/java/lang/natString.cc
View File

@ -687,6 +687,8 @@ java::lang::String::substring (jint beginIndex, jint endIndex)
{
if (beginIndex < 0 || endIndex > count || beginIndex > endIndex)
JvThrow (new StringIndexOutOfBoundsException());
if (beginIndex == 0 && endIndex == count)
return this;
jint newCount = endIndex - beginIndex;
if (newCount <= 8) // Optimization, mainly for GC.
return JvNewString(JvGetStringChars(this) + beginIndex, newCount);