Merge branch 'HEAD' of git@github.com:kvz/phpjs.git

brettz9 · brettz9 · commit b1d7af3c87b0 · 2010-10-23T03:59:54.000+08:00
diff --git a/functions/strings/soundex.js b/functions/strings/soundex.js
@@ -7,32 +7,34 @@ function soundex (str) {
     // +      input by: Brett Zamir (http://brett-zamir.me)
     // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
     // +   original by: Arnout Kazemier (http://www.3rd-Eden.com)
+    // +    revised by: Rafał Kukawski (http://blog.kukawski.pl)
     // *     example 1: soundex('Kevin');
     // *     returns 1: 'K150'
     // *     example 2: soundex('Ellery');
     // *     returns 2: 'E460'
     // *     example 3: soundex('Euler');
     // *     returns 3: 'E460'
 
-    var upStr = (str+'').toUpperCase();
-    var sdx = [upStr[0],0,0,0],
-        m = {BFPV: 1, CGJKQSXZ: 2, DT: 3, L: 4, MN: 5, R: 6 },
-        k = ['BFPV', 'CGJKQSXZ', 'DT', 'L', 'MN', 'R'],
-        i = 1, j = 0, s = 0, key, code,
-        l = upStr.length;
+    str = (str + '').toUpperCase();
+    if (!str) {
+        return '';
+    }
+    var sdx = [0, 0, 0, 0],
+        m = {B: 1, F: 1, P: 1, V: 1, C: 2, G: 2, J: 2, K: 2, Q: 2, S: 2, X: 2, Z: 2, D: 3, T: 3, L: 4, M: 5, N: 5, R: 6},
+        i = 0, j, s = 0, c, p;
 
-    for (; i < l; i++){
-        j = k.length;
-        while (s != 3 && j--){
-            key = k[j];
-            if (key.indexOf(upStr[i]) !== -1) {
-                code = m[key];
-                if (code != sdx[s]){
-                    sdx[++s] = code;
-                }
+    while ((c = str.charAt(i++)) && s < 4) {
+        if (j = m[c]) {
+            if (j !== p) {
+                sdx[s++] = p = j;
             }
+        } else {
+            s += i === 1;
+            p = 0;
         }
     }
-
+    
+    sdx[0] = str.charAt(0);
     return sdx.join('');
-}
+}
+
