From bff8f363ce5e2ca84da1d57a470f0648c4b338e6 Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Tue, 26 Nov 2019 20:53:27 -0500 Subject: Prefixes can now have names. --- src/org/unitConverter/unit/UnitDatabase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/org/unitConverter/unit/UnitDatabase.java') diff --git a/src/org/unitConverter/unit/UnitDatabase.java b/src/org/unitConverter/unit/UnitDatabase.java index 6a89b67..9df34a7 100644 --- a/src/org/unitConverter/unit/UnitDatabase.java +++ b/src/org/unitConverter/unit/UnitDatabase.java @@ -974,12 +974,13 @@ public final class UnitDatabase { */ private static final Map EXPRESSION_REPLACEMENTS = new HashMap<>(); + // add data to expression replacements static { // place brackets around any expression of the form "number unit", with or without the space EXPRESSION_REPLACEMENTS.put(Pattern.compile("((?:-?[1-9]\\d*|0)" // integer + "(?:\\.\\d+)?)" // optional decimal point with numbers after it + "\\s*" // optional space(s) - + "([a-zA-Z]+)" // unit name + + "([a-zA-Z]+)" // any string of letters + "(?!-?\\d)" // no number directly afterwards (avoids matching "1e3") ), "\\($1 $2\\)"); } -- cgit v1.2.3