--- a/Parser.st Thu Nov 17 16:21:06 2005 +0100
+++ b/Parser.st Fri Dec 02 12:28:55 2005 +0100
@@ -2309,15 +2309,18 @@
firstCharacterAfterArticle := aVariableName at:3.
firstCharacterAfterArticle isUppercase ifTrue:[
('AEIOX' includes:firstCharacterAfterArticle) ifFalse:[
- whatShouldItBeNamed := 'a' , (aVariableName copyFrom:3).
+ ((aVariableName copyFrom:3) startsWith:'Up') ifFalse:[
+ whatShouldItBeNamed := 'a' , (aVariableName copyFrom:3).
+ ]
]
].
- ].
- (aVariableName startsWith:'a') ifTrue:[
- firstCharacterAfterArticle := aVariableName at:2.
- firstCharacterAfterArticle isUppercase ifTrue:[
- ('AEIOX' includes:firstCharacterAfterArticle) ifTrue:[
- whatShouldItBeNamed := 'an' , (aVariableName copyFrom:2).
+ ] ifFalse:[
+ (aVariableName startsWith:'a') ifTrue:[
+ firstCharacterAfterArticle := aVariableName at:2.
+ firstCharacterAfterArticle isUppercase ifTrue:[
+ ('AEIOX' includes:firstCharacterAfterArticle) ifTrue:[
+ whatShouldItBeNamed := 'an' , (aVariableName copyFrom:2).
+ ].
].
].
].
@@ -8008,7 +8011,7 @@
!Parser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.471 2005-11-17 15:21:06 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.472 2005-12-02 11:28:55 cg Exp $'
! !
Parser initialize!