From 969a798998d67ce64bcdea38a444f47b95069f7b Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 11 Jul 2012 20:50:03 +0400 Subject: [PATCH] Pre-compile pattern for performance --- .../jetbrains/jet/jvm/compiler/NamespaceComparator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java index 7b25a85323d..7f048c263c9 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java @@ -41,6 +41,7 @@ import java.io.IOException; import java.io.StringReader; import java.lang.reflect.Method; import java.util.*; +import java.util.regex.Pattern; /** * @author Stepan Koltsov @@ -202,12 +203,12 @@ public class NamespaceComparator { */ private static class MemberComparator implements Comparator { + private static final Pattern IRRELEVANT = Pattern.compile( + "^ *(private|protected|public|internal|final|abstract|open|override|fun|val|var|/\\*.*?\\*/|((?!)<.*?>)| )*"); + @NotNull private String normalize(String s) { - return s.replaceFirst( - "^ *(private|protected|public|internal|final|abstract|open|override|fun|val|var|/\\*.*?\\*/|((?!)<.*?>)| )*", - "") - + s; + return IRRELEVANT.matcher(s).replaceAll(""); } @Override