You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2017/05/27 21:28:35 UTC
[4/4] groovy git commit: Remove pointless sign handling (closes #552)
Remove pointless sign handling (closes #552)
This code is useless as both of these code paths ultimately call out to
`CharScanner#parseIntFromTo` which handles the negative sign.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/61ba432d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/61ba432d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/61ba432d
Branch: refs/heads/GROOVY_2_4_X
Commit: 61ba432deb001a5796fd72abf69f99487ae67a31
Parents: 589846d
Author: James Laverack <ja...@jameslaverack.com>
Authored: Fri May 26 22:15:21 2017 +0100
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat May 27 14:22:48 2017 -0700
----------------------------------------------------------------------
.../java/groovy/json/internal/NumberValue.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/61ba432d/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
index 5e8e6ca..da98357 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
@@ -110,16 +110,10 @@ public class NumberValue extends java.lang.Number implements Value {
case DOUBLE:
return bigDecimalValue();
case INTEGER:
- int sign = 1;
- if (buffer[startIndex] == '-') {
- startIndex++;
- sign = -1;
- }
-
if (isInteger(buffer, startIndex, endIndex - startIndex)) {
- return intValue() * sign;
+ return intValue();
} else {
- return longValue() * sign;
+ return longValue();
}
}
die();
@@ -174,12 +168,7 @@ public class NumberValue extends java.lang.Number implements Value {
}
public int intValue() {
- int sign = 1;
- if (buffer[startIndex] == '-') {
- startIndex++;
- sign = -1;
- }
- return parseIntFromTo(buffer, startIndex, endIndex) * sign;
+ return parseIntFromTo(buffer, startIndex, endIndex);
}
public long longValue() {