hg/stx-libbasic2: comparison PhoneticStringUtilities.st

equal deleted inserted replaced

-:20dbad6d9935
+:3040ec2b4531
 addSecondaryTranslation: 'X'.
 skipCount := skipCount + 1.
 ^self ].
 (currentIndex = 1          "b"
-and: [ (inputKey size > 5 and: [(inputKey copyFrom: 1 to: 6) = 'CHARAC'
+and: [ (inputKey size > 5 and: [(inputKey startsWith: 'CHARAC')
-or: [ (inputKey copyFrom: 1 to: 6) = 'CHARIS' ]] )
+or: [ (inputKey startsWith: 'CHARIS') ]] )
-or: [inputKey size > 4 and: [ ((((inputKey copyFrom: 1 to: 4) = 'CHOR'
+or: [inputKey size > 4 and: [ ((((inputKey startsWith: 'CHOR')
-or: [ (inputKey copyFrom: 1 to: 4) = 'CHYM' ])
+or: [ (inputKey startsWith: 'CHYM') ])
-or: [ (inputKey copyFrom: 1 to: 4) = 'CHIA' ])
+or: [ (inputKey startsWith: 'CHIA') ])
-or: [ (inputKey copyFrom: 1 to: 4) = 'CHEM' ])
+or: [ (inputKey startsWith: 'CHEM') ])
-and: [ (inputKey copyFrom: 1 to: 4) ~= 'CHORE' ] ] ] ])
+and: [ (inputKey startsWith: 'CHORE') not ] ] ] ])
 ifTrue: [ self
 addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'K'.
 skipCount := skipCount + 1.
 ^self ].
 (((((#('VAN ' 'VON ') includes: (inputKey copyFrom: 1 to: 4))              "c"
-or: [ (inputKey copyFrom: 1 to: 3) = 'SCH' ])
+or: [ (inputKey startsWith: 'SCH') ])
 or: [ #('ORCHES' 'ARCHIT' 'ORCHID')
 includes: (self keyMidString: 6 from: currentIndex-2) ])
 or: [ #($T $S) includes: (self keyAt: currentIndex+2) ])
 or: [ ((currentIndex = 1)
 or: [ #($A $O $U $E) includes: (self keyAt: currentIndex-1) ])
 skipCount := skipCount + 1.
 ^self ]
 ifFalse:
 [ currentIndex > 1
 ifTrue:
-[ (inputKey copyFrom: 1 to: 2) = 'MC'
+[ (inputKey startsWith: 'MC')
 ifTrue:
 [ self
 addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'K' ]
 ifFalse:
 ifTrue: [
 " //obvious germanic
 if((StringAt(0, 4, VAN , VON , ) OR StringAt(0, 3, SCH, ))
 OR StringAt((current + 1), 2, ET, ))                                                MetaphAdd(K);"
 word := (inputKey copyFrom: 1 to: 4).
-((#('VAN ' 'VON ') includes: word) or: [(word copyFrom: 1 to: 3) = 'SCH' or: [(word copyFrom: 1 to: 2) = 'ET']])
+((#('VAN ' 'VON ') includes: word) or: [(word startsWith: 'SCH') or: [(word startsWith: 'ET')]])
 ifTrue: [
 self addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'K'.
 ] ifFalse: [
 " //always soft if french ending
 MetaphAdd(J);
 else
 MetaphAdd(J, K);
 current += 2;
 break;"
-(((inputKey copyFrom: currentIndex + 1 to: (currentIndex + 5 min: inputKey size)), '    ') copyFrom: 1 to: 4) = 'IER '
+(((inputKey copyFrom: currentIndex + 1 to: (currentIndex + 5 min: inputKey size)), '    ') startsWith: 'IER ')
 ifTrue: [
 self addPrimaryTranslation: 'J';
 addSecondaryTranslation: 'J'.
 ] ifFalse: [
 self addPrimaryTranslation: 'J';

changeset 5456	3040ec2b4531
parent 5236	28c398151366