[CODEC-125] Implement a Beider-Morse phonetic matching codec. Apply Matthew's patch https://issues.apache.org/jira/secure/attachment/12489569/fixmeInvariant.patch. This patch hoists the l-invariant code out of the loop over l. The d'ortley test input string exercises this branch. The "van helsing" input string should be exercising the alternate branch. Thank you MP!

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1154541 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/java/org/apache/commons/codec/language/bm/PhoneticEngine.java

@@ -287,6 +287,11 @@ public String encode(String input, final Languages.LanguageSet languageSet) {
         input = input.toLowerCase(Locale.ENGLISH).replace('-', ' ').trim();
 
         if (this.nameType == NameType.GENERIC) {
+            if (input.length() >= 2 && input.substring(0, 2).equals("d'")) { // check for d'
+                String remainder = input.substring(2);
+                String combined = "d" + remainder;
+                return "(" + encode(remainder) + ")-(" + encode(combined) + ")";
+            }
             for (String l : NAME_PREFIXES.get(this.nameType)) {
                 // handle generic prefixes
                 if (input.startsWith(l + " ")) {
@@ -295,12 +300,6 @@ public String encode(String input, final Languages.LanguageSet languageSet) {
                     String combined = l + remainder; // input with prefix without space
                     return "(" + encode(remainder) + ")-(" + encode(combined) + ")";
                 }
-                // fixme: this case is invariant on l
-                else if (input.length() >= 2 && input.substring(0, 2).equals("d'")) { // check for d'
-                    String remainder = input.substring(2);
-                    String combined = "d" + remainder;
-                    return "(" + encode(remainder) + ")-(" + encode(combined) + ")";
-                }
             }
         }