Changeset 14643 in josm for trunk/src/com/kitfox

Timestamp:

2019-01-05T18:49:33+01:00 (6 years ago)

Author:

Don-vip

Message:

optimize parsing by creating static regex patterns (patch by dpolivaev)

See ​https://github.com/blackears/svgSalamander/pull/38

File:

• trunk/src/com/kitfox/svg/SVGElement.java (modified) (3 diffs)

trunk/src/com/kitfox/svg/SVGElement.java

@@ -586 +586 @@
     }
 
+    private static final Pattern TRANSFORM_PATTERN = Pattern.compile("\\w+\\([^)]*\\)");
     static protected AffineTransform parseTransform(String val) throws SVGException
     {
-        final Matcher matchExpression = Pattern.compile("\\w+\\([^)]*\\)").matcher("");
+        final Matcher matchExpression = TRANSFORM_PATTERN.matcher("");
 
         AffineTransform retXform = new AffineTransform();
@@ -601 +602 @@
     }
 
+    private static final Pattern WORD_PATTERN = Pattern.compile("([a-zA-Z]+|-?\\d+(\\.\\d+)?(e-?\\d+)?|-?\\.\\d+(e-?\\d+)?)");
     static public AffineTransform parseSingleTransform(String val) throws SVGException
     {
-        final Matcher matchWord = Pattern.compile("([a-zA-Z]+|-?\\d+(\\.\\d+)?(e-?\\d+)?|-?\\.\\d+(e-?\\d+)?)").matcher("");
+        final Matcher matchWord = WORD_PATTERN.matcher("");
 
         AffineTransform retXform = new AffineTransform();
@@ -682 +684 @@
     }
 
+    private static final Pattern COMMAND_PATTERN = Pattern.compile("([MmLlHhVvAaQqTtCcSsZz])|([-+]?((\\d*\\.\\d+)|(\\d+))([eE][-+]?\\d+)?)");
     static protected PathCommand[] parsePathList(String list)
     {
-        final Matcher matchPathCmd = Pattern.compile("([MmLlHhVvAaQqTtCcSsZz])|([-+]?((\\d*\\.\\d+)|(\\d+))([eE][-+]?\\d+)?)").matcher(list);
+        final Matcher matchPathCmd = COMMAND_PATTERN.matcher(list);
 
         //Tokenize