Squeak-dev October 2009

squeak-dev@lists.squeakfoundation.org

84 participants
353 discussions

The Trunk: Multilingual-nice.49.mcz
by commits＠source.squeak.org 04 Oct '09

04 Oct '09

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.49.mcz ==================== Summary ==================== Name: Multilingual-nice.49 Author: nice Time: 4 October 2009, 8:46:01 am UUID: 07f2a5ad-c9e5-4923-8fcb-e71d06b9d49e Ancestors: Multilingual-cbc.48 According to http://bugs.squeak.org/view.php?id=6933 remove the instruction returning an empty string. If the stream is binary, we should rather return a an empty ByteArray. And this is handled the code following anyway. ==== ERROR === Error: subscript is out of bounds: 0 4 October 2009 6:47:13 pm VM: unix - a SmalltalkImage Image: Squeak3.7 [latest update: #5989] SecurityManager state: Restricted: false FileAccess: true SocketAccess: true Working Dir /home/squeaksource Trusted Dir /home/squeaksource/secure Untrusted Dir /home/squeaksource/My Squeak Array(Object)>>error: Receiver: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xDelimiter #xDe...etc... Arguments and temporary variables: aString: 'subscript is out of bounds: 0' Receiver's instance variables: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xDelimiter #xDe...etc... Array(Object)>>errorSubscriptBounds: Receiver: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xDelimiter #xDe...etc... Arguments and temporary variables: index: 0 Receiver's instance variables: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xDelimiter #xDe...etc... Array(Object)>>at: Receiver: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xDelimiter #xDe...etc... Arguments and temporary variables: index: 0 Receiver's instance variables: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xDelimiter #xDe...etc... Scanner>>scanToken Receiver: a Scanner Arguments and temporary variables: Receiver's instance variables: source: a ReadStream mark: 136 hereChar: $ aheadChar: $ token: 'Multilingual-Langua...etc... tokenType: #string currentComment: nil buffer: a WriteStream typeTable: #(#xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xBinary #xB...etc... --- The full stack --- Array(Object)>>error: Array(Object)>>errorSubscriptBounds: Array(Object)>>at: Scanner>>scanToken - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Scanner>>scanLitVec Scanner>>scanTokens: FilePackage>>classDefinition:with: FilePackage>>doIt: [] in FilePackage>>fileInFrom: {[:bar | 1 to: changes size do: [:i | bar value: i. chgRec := cha...]} ProgressInitiationException>>defaultAction UndefinedObject>>handleSignal: MethodContext(ContextPart)>>handleSignal: ProgressInitiationException(Exception)>>signal ProgressInitiationException>>display:at:from:to:during: ProgressInitiationException class>>display:at:from:to:during: String>>displayProgressAt:from:to:during: FilePackage>>fileInFrom: MCStReader>>loadDefinitions MCStReader(MCSnapshotReader)>>definitions [] in MCMczReader>>extractDefinitionsFrom: {[:rc | reader := rc on: member contentStream text. definitions addAll: rea...]} MCStReader class(Object)>>ifNotNilDo: MCMczReader>>extractDefinitionsFrom: [] in MCMczReader>>loadDefinitions {[:m | self extractDefinitionsFrom: m]} OrderedCollection>>do: MCMczReader>>loadDefinitions MCMczReader(MCVersionReader)>>definitions MCMczReader(MCVersionReader)>>snapshot [] in SSDiffyTextWriter>>writeVersion:for: {[ancestor ifNil: [self writeSnapshot: reader snapshot] ifNotNil: [patch ...]} BlockContext>>on:do: SSDiffyTextWriter>>writeVersion:for: SSEMailSubscription>>versionAdded:to: [] in SSProject>>versionAdded: {[each new versionAdded: aVersion to: self]} [] in BlockContext>>newProcess {[self value. Processor terminateActive]}

1 0

The Trunk: System-dtl.153.mcz
by commits＠source.squeak.org 04 Oct '09

04 Oct '09

David T. Lewis uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-dtl.153.mcz ==================== Summary ==================== Name: System-dtl.153 Author: dtl Time: 4 October 2009, 2:39:40 am UUID: 4da4372f-e1c7-4916-8f92-e3e6b52ed6e9 Ancestors: System-cwp.152 Add support for named serial ports to image, reference Mantis 7286. Change Set: SerialPortManagingNamedNodes-sk Date: 13 January 2009 Author: Séverin Lemaignan Recent Linux kernels don't mount most serial devices on /dev/ttySxx, but on more specific nodes, like /dev/ttyACMxx for modems, /dev/ttyUSBxx for certain USB->COM converters, etc. This change set adapt the SerialPort class to a new version of the VM SerialPlugin. =============== Diff against System-cwp.152 =============== Item was changed: ----- Method: SerialPort>>openPort: (in category 'open/close') ----- + openPort: portId + "Open the given serial port, using the settings specified by my + instance variables." - openPort: portNumber - "Open the given serial port, using the settings specified by my instance variables. If the port cannot be opened, such as when it is alreay in use, answer nil." "(DNS)" - self close. + portId isString + ifTrue: [self + primOpenPortByName: portId + baudRate: baudRate + stopBitsType: stopBitsType + parityType: parityType + dataBits: dataBits + inFlowControlType: inputFlowControlType + outFlowControlType: outputFlowControlType + xOnByte: xOnByte + xOffByte: xOffByte] + ifFalse: [self + primOpenPort: portId + baudRate: baudRate + stopBitsType: stopBitsType + parityType: parityType + dataBits: dataBits + inFlowControlType: inputFlowControlType + outFlowControlType: outputFlowControlType + xOnByte: xOnByte + xOffByte: xOffByte]. + port := portId! - (self primClosePort: portNumber) isNil ifTrue: [ - ^ nil ]. - (self primOpenPort: portNumber - baudRate: baudRate - stopBitsType: stopBitsType - parityType: parityType - dataBits: dataBits - inFlowControlType: inputFlowControlType - outFlowControlType: outputFlowControlType - xOnByte: xOnByte - xOffByte: xOffByte) isNil ifTrue: [ - ^ nil ]. - port := portNumber - ! Item was added: + ----- Method: SerialPort>>primWritePortByName:from:startingAt:count: (in category 'primitives') ----- + primWritePortByName: portName from: byteArray startingAt: startIndex count: count + <primitive: 'primitiveSerialPortWriteByName' module:'SerialPlugin'> + self primitiveFailed! Item was changed: ----- Method: SerialPort>>readString (in category 'input/output') ----- readString + "Answer a String read from this serial port. Answer the empty + String if no data is available. The port must be open." - "Answer a String read from this serial port. Answer the empty String if no data is available. The port must be open." - | buf count | buf := String new: 1000. + count := port isString ifTrue:[self + primReadPortByName: port + into: buf + startingAt: 1 + count: buf size.] + ifFalse:[self + primReadPort: port + into: buf + startingAt: 1 + count: buf size.]. + ^ buf copyFrom: 1 to: count! - count := self primReadPort: port into: buf startingAt: 1 count: buf size. - ^ buf copyFrom: 1 to: count - ! Item was added: + ----- Method: SerialPort>>primReadPortByName:into:startingAt:count: (in category 'primitives') ----- + primReadPortByName: portName into: byteArray startingAt: startIndex count: count + <primitive: 'primitiveSerialPortReadByName' module:'SerialPlugin'> + self primitiveFailed! Item was changed: ----- Method: SerialPort>>close (in category 'open/close') ----- close "Close the serial port. Do nothing if the port is not open." + port + ifNotNil: [port isString ifTrue:[self primClosePortByName: port] + ifFalse:[self primClosePort:port]]. + port := nil! - - port ifNotNil: [self primClosePort: port]. - port := nil. - ! Item was changed: ----- Method: SerialPort>>readInto:startingAt: (in category 'input/output') ----- + readInto: aStringOrByteArray startingAt: index + "Read data into the given String or ByteArray object starting at + the given index, and answer the number of bytes read. Does + not go past the end of the given String or ByteArray." + ^ port isString + ifTrue: [self primReadPortByName: port + into: aStringOrByteArray + startingAt: index + count: aStringOrByteArray size - index + 1] + ifFalse: [self primReadPort: port - readInto: aStringOrByteArray startingAt: index - "Read data into the given String or ByteArray object starting at the given index, and answer the number of bytes read. Does not go past the end of the given String or ByteArray." - - ^ self primReadPort: port into: aStringOrByteArray startingAt: index + count: aStringOrByteArray size - index + 1]. + ! - count: (aStringOrByteArray size - index) + 1. - ! Item was added: + ----- Method: SerialPort>>primClosePortByName: (in category 'primitives') ----- + primClosePortByName: portName + <primitive: 'primitiveSerialPortCloseByName' module:'SerialPlugin'> + ^ nil"(DNS)" + "self primitiveFailed."! Item was changed: ----- Method: SerialPort>>readByteArray (in category 'input/output') ----- readByteArray + "Answer a ByteArray read from this serial port. Answer an + empty ByteArray if no data is available. The port must be + open. " - "Answer a ByteArray read from this serial port. Answer an empty ByteArray if no data is available. The port must be open." - | buf count | buf := ByteArray new: 1000. + count := port isString + ifTrue: [self + primReadPortByName: port + into: buf + startingAt: 1 + count: buf size] + ifFalse: [self + primReadPort: port + into: buf + startingAt: 1 + count: buf size]. + ^ buf copyFrom: 1 to: count! - count := self primReadPort: port into: buf startingAt: 1 count: buf size. - ^ buf copyFrom: 1 to: count - ! Item was added: + ----- Method: SerialPort>>primOpenPortByName:baudRate:stopBitsType:parityType:dataBits:inFlowControlType:outFlowControlType:xOnByte:xOffByte: (in category 'primitives') ----- + primOpenPortByName: portName baudRate: baud stopBitsType: stop parityType: parity dataBits: numDataBits inFlowControlType: inFlowCtrl outFlowControlType: outFlowCtrl xOnByte: xOn xOffByte: xOff + <primitive: 'primitiveSerialPortOpenByName' module:'SerialPlugin'> + ^ nil"(DNS)"! Item was changed: ----- Method: SerialPort>>nextPutAll: (in category 'input/output') ----- + nextPutAll: aStringOrByteArray + "Send the given bytes out this serial port. The port must be + open. " + ^ port isString + ifTrue: [self + primWritePortByName: port + from: aStringOrByteArray + startingAt: 1 + count: aStringOrByteArray size] + ifFalse: [self + primWritePort: port - nextPutAll: aStringOrByteArray - "Send the given bytes out this serial port. The port must be open." - - ^ self primWritePort: port from: aStringOrByteArray startingAt: 1 + count: aStringOrByteArray size] - count: aStringOrByteArray size. !

1 0

The Trunk: MorphicExtras-nice.48.mcz
by commits＠source.squeak.org 04 Oct '09

04 Oct '09

Nicolas Cellier uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-nice.48.mcz ==================== Summary ==================== Name: MorphicExtras-nice.48 Author: nice Time: 4 October 2009, 8:33:03 am UUID: 2321e50d-1bba-458c-a955-04ce93e2c54e Ancestors: MorphicExtras-ar.47 Fix bug http://bugs.squeak.org/view.php?id=6732 In SketchEditorMorph, using undo on a polygon put it in a non-functioning state. =============== Diff against MorphicExtras-ar.47 =============== Item was changed: ----- Method: SketchEditorMorph>>polyFreeze (in category 'actions & preps') ----- polyFreeze "A live polygon is on the painting. Draw it into the painting and delete it." | poly | self polyEditing ifFalse:[^self]. + (poly := self valueOfProperty: #polygon) + ifNil: + [self polyEditing: false. + ^ self]. - (poly := self valueOfProperty: #polygon) ifNil: [^ self]. poly drawOn: formCanvas. poly delete. self setProperty: #polygon toValue: nil. self polyEditing: false.! Item was changed: ----- Method: SketchEditorMorph>>undo: (in category 'start & finish') ----- undo: evt "revert to a previous state. " | temp poly pen | self flag: #bob. "what is undo in multihand environment?" undoBuffer ifNil: [^Beeper beep]. "nothing to go back to" (poly := self valueOfProperty: #polygon) ifNotNil: [poly delete. self setProperty: #polygon toValue: nil. + self polyEditing: false. ^self]. temp := paintingForm. paintingForm := undoBuffer. undoBuffer := temp. "can get back to what you had by undoing again" pen := self get: #paintingFormPen for: evt. pen ifNil: [^Beeper beep]. pen setDestForm: paintingForm. formCanvas := paintingForm getCanvas. "used for lines, ovals, etc." formCanvas := formCanvas copyOrigin: self topLeft negated clipRect: (0 @ 0 extent: bounds extent). self render: bounds!

1 0

The Trunk: Kernel-nice.255.mcz
by commits＠source.squeak.org 04 Oct '09

04 Oct '09

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.255.mcz ==================== Summary ==================== Name: Kernel-nice.255 Author: nice Time: 4 October 2009, 7:54:12 am UUID: 847ee695-85a9-45dd-ae76-ad42a23fb2fd Ancestors: Kernel-ul.254 Fix from http://bugs.squeak.org/view.php?id=6697 Number>>storeOn:base: default implementation is wrong: It calls printOn:base: But printOn:Base: does not print the radix, when storeOn:Base: should. As every subclass (except ScaledDecimal) does implement storeOn:Base: the best thing to do is to defer subclassResponsibility. =============== Diff against Kernel-ul.254 =============== Item was changed: ----- Method: Number>>storeOn:base: (in category 'printing') ----- storeOn: aStream base: base + "This method should print a representation of the number for the given base, + including the base prefix (with letter r for radix)" + + ^self subclassResponsibility! - self printOn: aStream base: base! Item was changed: ----- Method: Number>>printOn:base: (in category 'printing') ----- printOn: aStream base: base + "This method should print a representation of the number for the given base, + excluding the base prefix (and the letter r for radix)" + ^self subclassResponsibility!

1 0

Understanding eCompletions
by Ross Boylan 04 Oct '09

04 Oct '09

I want completions, but I want them for things like lists of names. The current and past completion frameworks are very oriented to completing code. I figured I'd start by trying to see how they work. My results so far are a UMLish diagram I've added to http://wiki.squeak.org/squeak/5701. If you want to play, I have the Dia original that generated the image. Comments welcome. Ross Boylan

1 0

The Trunk: Collections-dtl.153.mcz
by commits＠source.squeak.org 03 Oct '09

03 Oct '09

David T. Lewis uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-dtl.153.mcz ==================== Summary ==================== Name: Collections-dtl.153 Author: dtl Time: 3 October 2009, 5:03:37 am UUID: 862a5701-d4ea-4fb5-b598-9829568bbdcb Ancestors: Collections-nice.152 Add range checks to the primitive fallback code in IntegerArray>>at:put: and IntegerArray>>atAllPut:. Throw an error for out of range value to prevent arithmetic overflow. Reference Mantis 7309 =============== Diff against Collections-nice.152 =============== Item was changed: ----- Method: IntegerArray>>atAllPut: (in category 'accessing') ----- atAllPut: anInteger | word | anInteger < 0 + ifTrue:[anInteger < -16r80000000 ifTrue: [self error: anInteger asString , ' out of range']. + "word _ 16r100000000 + anInteger" - ifTrue:["word := 16r100000000 + anInteger" word := (anInteger + 1) negated bitInvert32] + ifFalse:[anInteger > 16r7FFFFFFF ifTrue: [self error: anInteger asString , ' out of range']. + word := anInteger]. - ifFalse:[word := anInteger]. self primFill: word.! Item was changed: ----- Method: IntegerArray>>at:put: (in category 'accessing') ----- at: index put: anInteger | word | <primitive: 166> anInteger < 0 + ifTrue:[anInteger < -16r80000000 ifTrue: [self error: anInteger asString , ' out of range']. + "word _ 16r100000000 + anInteger" - ifTrue:["word := 16r100000000 + anInteger" word := (anInteger + 1) negated bitInvert32] + ifFalse:[anInteger > 16r7FFFFFFF ifTrue: [self error: anInteger asString , ' out of range']. + word := anInteger]. - ifFalse:[word := anInteger]. self basicAt: index put: word. ^anInteger!

1 0

The Trunk: CollectionsTests-dtl.100.mcz
by commits＠source.squeak.org 03 Oct '09

03 Oct '09

David T. Lewis uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-dtl.100.mcz ==================== Summary ==================== Name: CollectionsTests-dtl.100 Author: dtl Time: 3 October 2009, 4:55:52 am UUID: 0d66fd09-98a2-4f73-ba7e-bb6e65be712b Ancestors: CollectionsTests-nice.99 Add IntegerArrayTest. Verify storage of integer values in an IntegerArray. An IntegerArray stores 32-bit signed integer values. Lack of range check in primitive fallback code leads to arithmetic overflow errors, so attempts to store out of range values should raise errors. Reference Mantis 7309 =============== Diff against CollectionsTests-nice.99 =============== Item was added: + ----- Method: IntegerArrayTest>>testStoreSmallInteger (in category 'tests') ----- + testStoreSmallInteger + "Any SmallInteger may be stored in an IntegerArray." + + | ia val | + ia := IntegerArray new: 1. + val := SmallInteger maxVal. + ia at: 1 put: val. + self assert: ((ia at: 1) = val). + + val := SmallInteger minVal. + ia at: 1 put: val. + self assert: ((ia at: 1) = val) + ! Item was added: + ----- Method: IntegerArrayTest>>testStoreNegativeOutOfRange (in category 'tests') ----- + testStoreNegativeOutOfRange + "A value too small for a 32-bit signed integer should raise an error." + + | ia val storedValue | + ia := IntegerArray new: 1. + val := (2 raisedTo: 31) negated - 1. " -16r80000001 of range for 32-bit twos complement integer" + self should: [ia at: 1 put: val. "should raise error here" + storedValue := ia at: 1. "lack of range check leads to value of 16r7FFFFFFF" + self assert: val = storedValue "fail here"] + raise: Error + ! Item was added: + ----- Method: IntegerArrayTest>>testStorePositiveOutOfRange (in category 'tests') ----- + testStorePositiveOutOfRange + "A value too large for a 32-bit signed integer should raise an error." + + | ia val storedValue | + ia := IntegerArray new: 1. + val := 2 raisedTo: 31. "16r80000000 is out of range for 32-bit twos complement" + self should: [ia at: 1 put: val. "should raise error here" + storedValue := ia at: 1. "lack of range check leads to value of 16r-80000000" + self assert: val = storedValue "fail here"] + raise: Error + ! Item was added: + ----- Method: IntegerArrayTest>>testStoreLargeNegativeInteger (in category 'tests') ----- + testStoreLargeNegativeInteger + "A LargeNegativeInteger that does not exceed the range of a 32-bit twos + complement integer may be stored." + + | ia val | + ia := IntegerArray new: 1. + val := (2 raisedTo: 31) negated. "smallest negative 32-bit integer, a LargeNegativeInteger" + ia at: 1 put: val. + self assert: ((ia at: 1) = val) + ! Item was added: + ----- Method: IntegerArrayTest>>testStoreLargePositiveInteger (in category 'tests') ----- + testStoreLargePositiveInteger + "A LargePositiveInteger that does not exceed the range of a 32-bit twos + complement integer may be stored." + + | ia val | + ia := IntegerArray new: 1. + val := (2 raisedTo: 31) - 1. "largest positive 32-bit integer, a LargePositiveInteger" + ia at: 1 put: val. + self assert: ((ia at: 1) = val) + ! Item was added: + ClassTestCase subclass: #IntegerArrayTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CollectionsTests-Arrayed'! + + !IntegerArrayTest commentStamp: 'dtl 10/3/2009 16:37' prior: 0! + Verify storage of integer values in an IntegerArray. An IntegerArray stores 32-bit signed integer values. Lack of range check in primitive fallback code leads to arithmetic overflow errors, so attempts to store out of range values should raise errors.!

1 0

The Trunk: Collections-nice.152.mcz
by commits＠source.squeak.org 03 Oct '09

03 Oct '09

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.152.mcz ==================== Summary ==================== Name: Collections-nice.152 Author: nice Time: 3 October 2009, 9:45:06 am UUID: 3a9d8bc0-dc5d-4cad-84f8-1d80fb850b4c Ancestors: Collections-nice.151 Fix bug http://bugs.squeak.org/view.php?id=5331 beginsWith: did not work with a WideString receiver/argument Solution is to use super beginsWith: rather than fast primitive, except if both receiver and argument are bytes.... =============== Diff against Collections-nice.151 =============== Item was added: + ----- Method: ByteString>>beginsWith: (in category 'comparing') ----- + beginsWith: prefix + "Answer whether the receiver begins with the given prefix string. + The comparison is case-sensitive." + + + "IMPLEMENTATION NOTE: + following algorithm is optimized in primitive only in case self and prefix are bytes like. + Otherwise, if self is wide, then super outperforms, + Otherwise, if prefix is wide, primitive is not correct" + + prefix class isBytes ifFalse: [^super beginsWith: prefix]. + + self size < prefix size ifTrue: [^ false]. + ^ (self findSubstring: prefix in: self startingAt: 1 + matchTable: CaseSensitiveOrder) = 1 + ! Item was added: + ----- Method: ByteSymbol>>beginsWith: (in category 'comparing') ----- + beginsWith: prefix + "Answer whether the receiver begins with the given prefix string. + The comparison is case-sensitive." + + + "IMPLEMENTATION NOTE: + following algorithm is optimized in primitive only in case self and prefix are bytes like. + Otherwise, if self is wide, then super outperforms, + Otherwise, if prefix is wide, primitive is not correct" + + prefix class isBytes ifFalse: [^super beginsWith: prefix]. + + self size < prefix size ifTrue: [^ false]. + ^ (self findSubstring: prefix in: self startingAt: 1 + matchTable: CaseSensitiveOrder) = 1 + ! Item was removed: - ----- Method: String>>beginsWith: (in category 'comparing') ----- - beginsWith: prefix - "Answer whether the receiver begins with the given prefix string. - The comparison is case-sensitive." - - self size < prefix size ifTrue: [^ false]. - ^ (self findSubstring: prefix in: self startingAt: 1 - matchTable: CaseSensitiveOrder) = 1 - !

1 0

The Trunk: Collections-nice.151.mcz
by commits＠source.squeak.org 03 Oct '09

03 Oct '09

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.151.mcz ==================== Summary ==================== Name: Collections-nice.151 Author: nice Time: 3 October 2009, 9:36:34 am UUID: 1c18912c-877b-4777-b8ad-d6f8a9e27717 Ancestors: Collections-ar.150 Merge patch from http://bugs.squeak.org/view.php?id=6366 Avoid direct use of findSubstring:in:starting:matchTable: and CaseSensitiveOrder / CaseInsensitiveOrder because it does not work with WideString =============== Diff against Collections-ar.150 =============== Item was changed: ----- Method: String>>findString:startingAt:caseSensitive: (in category 'accessing') ----- + findString: key startingAt: start caseSensitive: caseSensitive + "Answer the index in this String at which the substring key first occurs, + at or beyond start. The match can be case-sensitive or not. If no match + is found, zero will be returned." + + "IMPLEMENTATION NOTE: do not use CaseSensitiveOrder because it is broken for WideString + This is a temporary work around until Wide CaseSensitiveOrder search is fixed + Code should revert to: - findString: key startingAt: start caseSensitive: caseSensitive - "Answer the index in this String at which the substring key first occurs, at or beyond start. The match can be case-sensitive or not. If no match is found, zero will be returned." - caseSensitive + ifTrue: [^ self findSubstring: key in: self startingAt: start matchTable: CaseSensitiveOrder] + ifFalse: [^ self findSubstring: key in: self startingAt: start matchTable: CaseInsensitiveOrder]" + + ^caseSensitive + ifTrue: [ + (self class isBytes and: [key class isBytes]) + ifTrue: [self + findSubstring: key + in: self + startingAt: start + matchTable: CaseSensitiveOrder] + ifFalse: [WideString new + findSubstring: key + in: self + startingAt: start + matchTable: nil]] + ifFalse: [ + (self class isBytes and: [key class isBytes]) + ifTrue: [self + findSubstring: key + in: self + startingAt: start + matchTable: CaseInsensitiveOrder] + ifFalse: [WideString new + findSubstring: key + in: self + startingAt: start + matchTable: CaseInsensitiveOrder]]! - ifTrue: [^ self findSubstring: key in: self startingAt: start matchTable: CaseSensitiveOrder] - ifFalse: [^ self findSubstring: key in: self startingAt: start matchTable: CaseInsensitiveOrder]! Item was changed: ----- Method: String>>numArgs (in category 'system primitives') ----- numArgs "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. Note that currently this will answer -1 for anything begining with an uppercase letter even though the system will accept such symbols as selectors. It is intended mostly for the assistance of spelling correction." | firstChar numColons excess start ix | self size = 0 ifTrue: [^ -1]. firstChar := self at: 1. (firstChar isLetter or: [firstChar = $:]) ifTrue: + ["Fast reject if any chars are non-alphanumeric + NOTE: fast only for Byte things - Broken for Wide" + self class isBytes + ifTrue: [(self findSubstring: '~' in: self startingAt: 1 matchTable: Tokenish) > 0 ifTrue: [^ -1]] + ifFalse: [2 to: self size do: [:i | (self at: i) tokenish ifFalse: [^ -1]]]. - ["Fast reject if any chars are non-alphanumeric" - (self findSubstring: '~' in: self startingAt: 1 matchTable: Tokenish) > 0 ifTrue: [^ -1]. "Fast colon count" numColons := 0. start := 1. + [(ix := self indexOf: $: startingAt: start) > 0] - [(ix := self findSubstring: ':' in: self startingAt: start matchTable: CaseSensitiveOrder) > 0] whileTrue: [numColons := numColons + 1. start := ix + 1]. numColons = 0 ifTrue: [^ 0]. firstChar = $: ifTrue: [excess := 2 "Has an initial keyword, as #:if:then:else:"] ifFalse: [excess := 0]. self last = $: ifTrue: [^ numColons - excess] ifFalse: [^ numColons - excess - 1 "Has a final keywords as #nextPut::andCR"]]. firstChar isSpecial ifTrue: [self size = 1 ifTrue: [^ 1]. 2 to: self size do: [:i | (self at: i) isSpecial ifFalse: [^ -1]]. ^ 1]. ^ -1.! Item was changed: ----- Method: String>>indexOfSubCollection:startingAt:ifAbsent: (in category 'accessing') ----- indexOfSubCollection: sub startingAt: start ifAbsent: exceptionBlock | index | + index := self findString: sub startingAt: start. - index := self findSubstring: sub in: self startingAt: start matchTable: CaseSensitiveOrder. index = 0 ifTrue: [^ exceptionBlock value]. ^ index! Item was changed: ----- Method: String>>findWordStart:startingAt: (in category 'accessing') ----- findWordStart: key startingAt: start | ind | "HyperCard style searching. Answer the index in self of the substring key, when that key is preceeded by a separator character. Must occur at or beyond start. The match is case-insensitive. If no match is found, zero will be returned." ind := start. + [ind := self findString: key startingAt: ind caseSensitive: false. - [ind := self findSubstring: key in: self startingAt: ind matchTable: CaseInsensitiveOrder. ind = 0 ifTrue: [^ 0]. "not found" ind = 1 ifTrue: [^ 1]. "First char is the start of a word" (self at: ind-1) isSeparator] whileFalse: [ind := ind + 1]. ^ ind "is a word start"! Item was changed: ----- Method: String>>findString:startingAt: (in category 'accessing') ----- findString: subString startingAt: start "Answer the index of subString within the receiver, starting at start. If the receiver does not contain subString, answer 0." + ^self findString: subString startingAt: start caseSensitive: true! - ^ self findSubstring: subString in: self startingAt: start matchTable: CaseSensitiveOrder! Item was changed: ----- Method: String>>endsWith: (in category 'comparing') ----- endsWith: suffix "Answer whether the tail end of the receiver is the same as suffix. The comparison is case-sensitive." + | extra | (extra := self size - suffix size) < 0 ifTrue: [^ false]. + ^ (self findString: suffix startingAt: extra + 1) > 0 - ^ (self findSubstring: suffix in: self startingAt: extra + 1 - matchTable: CaseSensitiveOrder) > 0 " 'Elvis' endsWith: 'vis' "! Item was changed: ----- Method: Symbol class>>selectorsContaining: (in category 'access') ----- selectorsContaining: aString "Answer a list of selectors that contain aString within them. Case-insensitive. Does return symbols that begin with a capital letter." | size selectorList ascii | selectorList := OrderedCollection new. (size := aString size) = 0 ifTrue: [^selectorList]. aString size = 1 ifTrue: [ ascii := aString first asciiValue. ascii < 128 ifTrue: [selectorList add: (OneCharacterSymbols at: ascii+1)] ]. aString first isLetter ifFalse: [ aString size == 2 ifTrue: [Symbol hasInterned: aString ifTrue: [:s | selectorList add: s]]. ^selectorList ]. selectorList := selectorList copyFrom: 2 to: selectorList size. self allSymbolTablesDo: [:each | each size >= size ifTrue: + [(each findString: aString startingAt: 1 caseSensitive: false) > 0 - [(each findSubstring: aString in: each startingAt: 1 - matchTable: CaseInsensitiveOrder) > 0 ifTrue: [selectorList add: each]]]. ^selectorList reject: [:each | "reject non-selectors, but keep ones that begin with an uppercase" each numArgs < 0 and: [each asString withFirstCharacterDownshifted numArgs < 0]]. "Symbol selectorsContaining: 'scon'"! Item was changed: ----- Method: String>>findLastOccuranceOfString:startingAt: (in category 'accessing') ----- findLastOccuranceOfString: subString startingAt: start "Answer the index of the last occurance of subString within the receiver, starting at start. If the receiver does not contain subString, answer 0." | last now | + last := self findString: subString startingAt: start. - last := self findSubstring: subString in: self startingAt: start matchTable: CaseSensitiveOrder. last = 0 ifTrue: [^ 0]. [last > 0] whileTrue: [ now := last. + last := self findString: subString startingAt: last + 1. - last := self findSubstring: subString in: self startingAt: last + 1 matchTable: CaseSensitiveOrder. ]. ^ now. !

1 0

duplicated rectangles in DamageRecorder
by Yoshiki Ohshima 03 Oct '09

03 Oct '09

Hello, I noticed that I often get duplicated (i.e. equal) rectangles in invalidRects of DamageRecorder. In #recordInvalidRect: you make the part to read: invalidRects do: [:rect | (newRect origin = rect origin and: [newRect corner = rect corner]) ifTrue: [Display reverse: newRect]. ... and you'll see when it happens. If I understand it correctly the duplicate there doesn't result in multiple drawing (via the 'validList' logic), but I do see a bit of improvement in browser opening benchmarks etc. (2% or such, could be just jitter, though), if I change "Display reverse: newRect" to "^ self". I'd like to hear if this makes any sense, or more consistent benchmark results, etc. -- Yoshiki

6 8

Jump to page: