From 740c5a4c13e98bd04b385eee9b881e53eb88d3b8 Mon Sep 17 00:00:00 2001 From: Adrien Hopkins Date: Mon, 26 Aug 2019 16:52:11 -0400 Subject: The unit file parser now uses regular expressions. --- src/org/unitConverter/UnitsDatabase.java | 26 +++++++++++++++++----- .../converterGUI/DelegateListModel.java | 0 .../converterGUI/FilterComparator.java | 0 .../unitConverter/converterGUI/GridBagBuilder.java | 0 .../converterGUI/UnitConverterGUI.java | 0 src/org/unitConverter/dimension/BaseDimension.java | 0 .../dimension/OtherBaseDimension.java | 0 .../unitConverter/dimension/SIBaseDimension.java | 0 .../dimension/StandardDimensions.java | 0 src/org/unitConverter/dimension/UnitDimension.java | 0 src/org/unitConverter/dimension/package-info.java | 0 src/org/unitConverter/unit/BaseUnit.java | 0 src/org/unitConverter/unit/DefaultUnitPrefix.java | 0 src/org/unitConverter/unit/NonlinearUnits.java | 0 src/org/unitConverter/unit/SIPrefix.java | 0 src/org/unitConverter/unit/Unit.java | 0 src/org/unitConverter/unit/UnitPrefix.java | 0 src/org/unitConverter/unit/UnitSystem.java | 0 src/test/java/UnitDimensionTest.java | 0 src/test/java/UnitTest.java | 0 20 files changed, 21 insertions(+), 5 deletions(-) mode change 100755 => 100644 src/org/unitConverter/UnitsDatabase.java mode change 100755 => 100644 src/org/unitConverter/converterGUI/DelegateListModel.java mode change 100755 => 100644 src/org/unitConverter/converterGUI/FilterComparator.java mode change 100755 => 100644 src/org/unitConverter/converterGUI/GridBagBuilder.java mode change 100755 => 100644 src/org/unitConverter/converterGUI/UnitConverterGUI.java mode change 100755 => 100644 src/org/unitConverter/dimension/BaseDimension.java mode change 100755 => 100644 src/org/unitConverter/dimension/OtherBaseDimension.java mode change 100755 => 100644 src/org/unitConverter/dimension/SIBaseDimension.java mode change 100755 => 100644 src/org/unitConverter/dimension/StandardDimensions.java mode change 100755 => 100644 src/org/unitConverter/dimension/UnitDimension.java mode change 100755 => 100644 src/org/unitConverter/dimension/package-info.java mode change 100755 => 100644 src/org/unitConverter/unit/BaseUnit.java mode change 100755 => 100644 src/org/unitConverter/unit/DefaultUnitPrefix.java mode change 100755 => 100644 src/org/unitConverter/unit/NonlinearUnits.java mode change 100755 => 100644 src/org/unitConverter/unit/SIPrefix.java mode change 100755 => 100644 src/org/unitConverter/unit/Unit.java mode change 100755 => 100644 src/org/unitConverter/unit/UnitPrefix.java mode change 100755 => 100644 src/org/unitConverter/unit/UnitSystem.java mode change 100755 => 100644 src/test/java/UnitDimensionTest.java mode change 100755 => 100644 src/test/java/UnitTest.java (limited to 'src') diff --git a/src/org/unitConverter/UnitsDatabase.java b/src/org/unitConverter/UnitsDatabase.java old mode 100755 new mode 100644 index 37d53d4..dcc98df --- a/src/org/unitConverter/UnitsDatabase.java +++ b/src/org/unitConverter/UnitsDatabase.java @@ -36,6 +36,8 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.unitConverter.dimension.UnitDimension; import org.unitConverter.math.DecimalComparison; @@ -971,6 +973,11 @@ public final class UnitsDatabase { } } + /** + * A regular expression that separates names and expressions in unit files. + */ + private static final Pattern NAME_EXPRESSION = Pattern.compile("(\\S+)\\s+(\\S.*)"); + /** * The exponent operator * @@ -1200,13 +1207,22 @@ public final class UnitsDatabase { } // divide line into name and expression - final String[] parts = line.split("\t"); - if (parts.length < 2) + final Matcher lineMatcher = NAME_EXPRESSION.matcher(line); + if (!lineMatcher.matches()) throw new IllegalArgumentException(String.format( - "Lines must consist of a unit name and its definition, separated by tab(s) (line %d).", + "Error at line %d: Lines of a unit file must consist of a unit name, then spaces or tabs, then a unit expression.", lineCounter)); - final String name = parts[0]; - final String expression = parts[parts.length - 1]; + final String name = lineMatcher.group(1); + final String expression = lineMatcher.group(2); + + // divide line into name and expression + // final String[] parts = line.split("\t"); + // if (parts.length < 2) + // throw new IllegalArgumentException(String.format( + // "Lines must consist of a unit name and its definition, separated by tab(s) (line %d).", + // lineCounter)); + // final String name = parts[0]; + // final String expression = parts[parts.length - 1]; if (name.endsWith(" ")) { System.err.printf("Warning - line %d's unit name ends in a space", lineCounter); diff --git a/src/org/unitConverter/converterGUI/DelegateListModel.java b/src/org/unitConverter/converterGUI/DelegateListModel.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/converterGUI/FilterComparator.java b/src/org/unitConverter/converterGUI/FilterComparator.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/converterGUI/GridBagBuilder.java b/src/org/unitConverter/converterGUI/GridBagBuilder.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/converterGUI/UnitConverterGUI.java b/src/org/unitConverter/converterGUI/UnitConverterGUI.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/dimension/BaseDimension.java b/src/org/unitConverter/dimension/BaseDimension.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/dimension/OtherBaseDimension.java b/src/org/unitConverter/dimension/OtherBaseDimension.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/dimension/SIBaseDimension.java b/src/org/unitConverter/dimension/SIBaseDimension.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/dimension/StandardDimensions.java b/src/org/unitConverter/dimension/StandardDimensions.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/dimension/UnitDimension.java b/src/org/unitConverter/dimension/UnitDimension.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/dimension/package-info.java b/src/org/unitConverter/dimension/package-info.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/BaseUnit.java b/src/org/unitConverter/unit/BaseUnit.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/DefaultUnitPrefix.java b/src/org/unitConverter/unit/DefaultUnitPrefix.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/NonlinearUnits.java b/src/org/unitConverter/unit/NonlinearUnits.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/SIPrefix.java b/src/org/unitConverter/unit/SIPrefix.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/Unit.java b/src/org/unitConverter/unit/Unit.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/UnitPrefix.java b/src/org/unitConverter/unit/UnitPrefix.java old mode 100755 new mode 100644 diff --git a/src/org/unitConverter/unit/UnitSystem.java b/src/org/unitConverter/unit/UnitSystem.java old mode 100755 new mode 100644 diff --git a/src/test/java/UnitDimensionTest.java b/src/test/java/UnitDimensionTest.java old mode 100755 new mode 100644 diff --git a/src/test/java/UnitTest.java b/src/test/java/UnitTest.java old mode 100755 new mode 100644 -- cgit v1.2.3