class: EditTextView
changed: #sort:ignoreCase:fromLine:toLine:
sort by hex col: allow smalltalk syntax numbers
--- a/EditTextView.st Fri Sep 06 18:14:12 2013 +0200
+++ b/EditTextView.st Sat Sep 07 10:26:10 2013 +0200
@@ -6688,14 +6688,22 @@
nStr isEmptyOrNil ifTrue:[^ self].
n := Integer readFrom:nStr onError:[^ self].
LastColumnNumberForSort := n.
- extractor := [:l | ((l asCollectionOfWords) at:n ifAbsent:'')].
+ extractor := [:l | ((l string asCollectionOfWords) at:n ifAbsent:'')].
how == #linesByNthNumber ifTrue:[
innerExtractor := extractor.
extractor := [:l | Integer readFrom:(innerExtractor value:l) onError:0]
] ifFalse:[
how == #linesByNthHexNumber ifTrue:[
innerExtractor := extractor.
- extractor := [:l | Integer readFrom:(innerExtractor value:l) radix:16 onError:0]
+ extractor := [:l |
+ |s|
+ s := innerExtractor value:l.
+ (s startsWith:'16r') ifTrue:[
+ (Integer readSmalltalkSyntaxFrom:s) ? 0
+ ] ifFalse:[
+ Integer readFrom:s radix:16 onError:[ 0 ]
+ ]
+ ]
]
].
] ifFalse:[
@@ -8304,10 +8312,10 @@
!EditTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.578 2013-09-05 13:38:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.579 2013-09-07 08:26:10 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.578 2013-09-05 13:38:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.579 2013-09-07 08:26:10 cg Exp $'
! !