procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

For PR libgcj/11085:

Browse source 
* java/text/SimpleDateFormat.java (parse(String,ParsePosition)):
	Limit number of characters in numeric field when required.
	* java/text/DecimalFormat.java (parse(String,ParsePosition)):
	Respect maximumIntegerDigits.

From-SVN: r67633
This commit is contained in:
Tom Tromey 2003-06-08 19:00:02 +00:00 • committed by Tom Tromey
parent 5f158b4400
commit 0a56537c16
3 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libjava/java/text/DecimalFormat.java
View file

@ -1,5 +1,5 @@
/* DecimalFormat.java -- Formats and parses numbers
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -693,8 +693,8 @@ public class DecimalFormat extends NumberFormat
int index = pos.getIndex();
StringBuffer buf = new StringBuffer ();
// We have to check both prefixes, because one might be empty.
// We want to pick the longest prefix that matches.
// We have to check both prefixes, because one might be empty. We
// want to pick the longest prefix that matches.
boolean got_pos = str.startsWith(positivePrefix, index);
String np = (negativePrefix != null
? negativePrefix
@ -729,11 +729,14 @@ public class DecimalFormat extends NumberFormat
// FIXME: handle Inf and NaN.
// FIXME: do we have to respect minimum/maxmimum digit stuff?
// What about leading zeros? What about multiplier?
// FIXME: do we have to respect minimum digits?
// What about leading zeros? What about multiplier?
int start_index = index;
int max = str.length();
int last = index + maximumIntegerDigits;
if (last > 0 && max > last)
max = last;
char zero = symbols.getZeroDigit();
int last_group = -1;
boolean int_part = true;