diff options
Diffstat (limited to 'src/org/unitConverter/unit/UnitDatabase.java')
| -rw-r--r-- | src/org/unitConverter/unit/UnitDatabase.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/org/unitConverter/unit/UnitDatabase.java b/src/org/unitConverter/unit/UnitDatabase.java index 9df34a7..65d52bf 100644 --- a/src/org/unitConverter/unit/UnitDatabase.java +++ b/src/org/unitConverter/unit/UnitDatabase.java @@ -978,9 +978,10 @@ public final class UnitDatabase { 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 + + "(?:\\.\\d+(?:[eE]\\d+))?)" // optional decimal point with numbers after it + "\\s*" // optional space(s) - + "([a-zA-Z]+)" // any string of letters + + "([a-zA-Z]+(?:\\^\\d+)?" // any string of letters + + "(?:\\s+[a-zA-Z]+(?:\\^\\d+)?))" // optional other letters + "(?!-?\\d)" // no number directly afterwards (avoids matching "1e3") ), "\\($1 $2\\)"); } @@ -1473,8 +1474,6 @@ public final class UnitDatabase { modifiedExpression = replacement.getKey().matcher(modifiedExpression).replaceAll(replacement.getValue()); } - System.out.println(modifiedExpression); - return this.prefixExpressionParser.parseExpression(modifiedExpression); } |