Changeset 3367

Timestamp:

03/16/08 01:54:47 (6 months ago)

Author:

kris

Message:

fixes #975 :: Need a case insensitive find in tango.text.Ascii

Thanks to stonecobra & nietsnie

Files:

• trunk/tango/text/Ascii.d (modified) (3 diffs)

trunk/tango/text/Ascii.d

@@ -8 +8 @@
-
-        author:         Kris
-
-
-        Placeholder for a selection of ASCII utilities. These generally will
@@ -119 +118 @@
-/******************************************************************************
-
+        Return the index position of a text pattern within src, or
+        pattern.length upon failure.
+
+        This is a case-insensitive search (with thanks to Nietsnie)
+        
+******************************************************************************/
+
+static int isearch (in char[] src, in char[] pattern)
+{
+        static  char[] _caseMap = 
+                [ 
+                '\000','\001','\002','\003','\004','\005','\006','\007',
+                '\010','\011','\012','\013','\014','\015','\016','\017',
+                '\020','\021','\022','\023','\024','\025','\026','\027',
+                '\030','\031','\032','\033','\034','\035','\036','\037',
+                '\040','\041','\042','\043','\044','\045','\046','\047',
+                '\050','\051','\052','\053','\054','\055','\056','\057',
+                '\060','\061','\062','\063','\064','\065','\066','\067',
+                '\070','\071','\072','\073','\074','\075','\076','\077',
+                '\100','\141','\142','\143','\144','\145','\146','\147',
+                '\150','\151','\152','\153','\154','\155','\156','\157',
+                '\160','\161','\162','\163','\164','\165','\166','\167',
+                '\170','\171','\172','\133','\134','\135','\136','\137',
+                '\140','\141','\142','\143','\144','\145','\146','\147',
+                '\150','\151','\152','\153','\154','\155','\156','\157',
+                '\160','\161','\162','\163','\164','\165','\166','\167',
+                '\170','\171','\172','\173','\174','\175','\176','\177',
+                '\200','\201','\202','\203','\204','\205','\206','\207',
+                '\210','\211','\212','\213','\214','\215','\216','\217',
+                '\220','\221','\222','\223','\224','\225','\226','\227',
+                '\230','\231','\232','\233','\234','\235','\236','\237',
+                '\240','\241','\242','\243','\244','\245','\246','\247',
+                '\250','\251','\252','\253','\254','\255','\256','\257',
+                '\260','\261','\262','\263','\264','\265','\266','\267',
+                '\270','\271','\272','\273','\274','\275','\276','\277',
+                '\300','\341','\342','\343','\344','\345','\346','\347',
+                '\350','\351','\352','\353','\354','\355','\356','\357',
+                '\360','\361','\362','\363','\364','\365','\366','\367',
+                '\370','\371','\372','\333','\334','\335','\336','\337',
+                '\340','\341','\342','\343','\344','\345','\346','\347',
+                '\350','\351','\352','\353','\354','\355','\356','\357',
+                '\360','\361','\362','\363','\364','\365','\366','\367',
+                '\370','\371','\372','\373','\374','\375','\376','\377',
+                ];  
+
+
+        assert(src.ptr);
+        assert(pattern.ptr);
+
+        for (uint i2, i1=0; i1 < src.length; ++i1)
+            {   
+            for (i2=0; i2 < pattern.length; ++i2)
+                 if (_caseMap[src[i1 + i2]] != _caseMap[pattern[i2]])
+                     break;
+
+            if (i2 is pattern.length)
+                return i1;
+            }   
+        return src.length;
+}
+
+
+
+/******************************************************************************
+
-******************************************************************************/
-
-debug (UnitTest)
-{       
-//        
+        //
-        
-        unittest
@@ -138 +202 @@
-        assert (icompare ("abc", "abcd") < 0);
-        assert (icompare ("ACC", "abc") > 0);
+
+        assert (isearch ("ACC", "abc") is 3);
+        assert (isearch ("ACC", "acc") is 0);
+        assert (isearch ("aACC", "acc") is 1);
-        }
-}