From 03dc189cee0409a92577b696aa69553d6da7d700 Mon Sep 17 00:00:00 2001 From: tmayer Date: Fri, 26 Feb 2021 19:57:32 +0100 Subject: [PATCH 1/5] Exception fix --- .../minidev/json/parser/JSONParserBase.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java index 047a003..0e9852d 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java @@ -132,13 +132,21 @@ public void checkLeadinZero() throws ParseException { } protected Number extractFloat() throws ParseException { - if (!acceptLeadinZero) - checkLeadinZero(); - if (!useHiPrecisionFloat) - return Float.parseFloat(xs); - if (xs.length() > 18) // follow JSonIJ parsing method - return new BigDecimal(xs); - return Double.parseDouble(xs); + + if (!acceptLeadinZero) + checkLeadinZero(); + + try{ + if (!useHiPrecisionFloat) + return Float.parseFloat(xs); + + if (xs.length() > 18) // follow JSonIJ parsing method + return new BigDecimal(xs); + + return Double.parseDouble(xs); + } catch(Exception e) { + throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs ); + } } /** From 460d56562aa46119f0fefe542e1676a52484f30a Mon Sep 17 00:00:00 2001 From: tmayer Date: Fri, 26 Feb 2021 19:59:56 +0100 Subject: [PATCH 2/5] identation --- .../java/net/minidev/json/parser/JSONParserBase.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java index 0e9852d..f022b37 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java @@ -132,11 +132,10 @@ public void checkLeadinZero() throws ParseException { } protected Number extractFloat() throws ParseException { - - if (!acceptLeadinZero) - checkLeadinZero(); - - try{ + if (!acceptLeadinZero) + checkLeadinZero(); + + try { if (!useHiPrecisionFloat) return Float.parseFloat(xs); From 0c59c1bb3a6324dfcf17dd0432f18344220c2889 Mon Sep 17 00:00:00 2001 From: tmayer Date: Fri, 26 Feb 2021 20:02:00 +0100 Subject: [PATCH 3/5] identation --- .../net/minidev/json/parser/JSONParserBase.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java index f022b37..9856dc5 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java @@ -132,20 +132,21 @@ public void checkLeadinZero() throws ParseException { } protected Number extractFloat() throws ParseException { - if (!acceptLeadinZero) + if (!acceptLeadinZero) checkLeadinZero(); - try { + try { if (!useHiPrecisionFloat) return Float.parseFloat(xs); if (xs.length() > 18) // follow JSonIJ parsing method return new BigDecimal(xs); - - return Double.parseDouble(xs); + + return Double.parseDouble(xs); + } catch(Exception e) { - throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs ); - } + throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs ); + } } /** From 4ad165d563b69f8680c6673d800853fb4333c7ec Mon Sep 17 00:00:00 2001 From: tmayer Date: Fri, 26 Feb 2021 20:05:36 +0100 Subject: [PATCH 4/5] identation of github is insane --- .../main/java/net/minidev/json/parser/JSONParserBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java index 9856dc5..dd61117 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java @@ -144,9 +144,9 @@ protected Number extractFloat() throws ParseException { return Double.parseDouble(xs); - } catch(Exception e) { - throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs ); - } + } catch(Exception e){ + throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs); + } } /** From 3db4106ff2c9c1e9b919b49aeba52eabdfff7220 Mon Sep 17 00:00:00 2001 From: tmayer Date: Fri, 26 Feb 2021 23:05:46 +0100 Subject: [PATCH 5/5] reidentation and new exception --- .../minidev/json/parser/JSONParserBase.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java index dd61117..8c5373d 100644 --- a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java +++ b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java @@ -133,20 +133,20 @@ public void checkLeadinZero() throws ParseException { protected Number extractFloat() throws ParseException { if (!acceptLeadinZero) - checkLeadinZero(); - - try { - if (!useHiPrecisionFloat) + checkLeadinZero(); + + try { + if (!useHiPrecisionFloat) return Float.parseFloat(xs); - - if (xs.length() > 18) // follow JSonIJ parsing method + + if (xs.length() > 18) // follow JSonIJ parsing method return new BigDecimal(xs); - return Double.parseDouble(xs); + return Double.parseDouble(xs); - } catch(Exception e){ - throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs); - } + } catch(NumberFormatException e){ + throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs); + } } /**