Squeak-dev November 2010

squeak-dev@lists.squeakfoundation.org

77 participants
254 discussions

The Trunk: Files-ul.91.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Files to project The Trunk: http://source.squeak.org/trunk/Files-ul.91.mcz ==================== Summary ==================== Name: Files-ul.91 Author: ul Time: 2 November 2010, 3:37:33.101 am UUID: 4398bfc8-86a5-e14e-8adb-c302285603af Ancestors: Files-ul.90 - initialize StdioHandles without restarting the image =============== Diff against Files-ul.90 =============== Item was changed: + (PackageInfo named: 'Files') postscript: '| handleArray | + handleArray := StandardFileStream classPool at: #StdioHandles. + (handleArray isNil or: [ handleArray allSatisfy: [ :each | each isNil ] ]) + ifTrue: [ StandardFileStream startUp: true ]'! - (PackageInfo named: 'Files') postscript: 'StandardFileStream allSubInstancesDo: [ :each | - each enableReadBuffering ]'!

1 0

The Trunk: Multilingual-ul.130.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-ul.130.mcz ==================== Summary ==================== Name: Multilingual-ul.130 Author: ul Time: 2 November 2010, 3:24:09.278 am UUID: 3bd5d5a6-9eba-594f-8712-0bbdbeb9df7c Ancestors: Multilingual-cmm.129 - make sure MultiByteFileStream can also be used as an stdio stream =============== Diff against Multilingual-cmm.129 =============== Item was added: + ----- Method: MultiByteFileStream>>openOnHandle:name:forWrite: (in category 'open/close') ----- + openOnHandle: aFileID name: streamName forWrite: writeMode + + super openOnHandle: aFileID name: streamName forWrite: writeMode. + self converter "Make sure that converter is initialized."!

1 0

The Trunk: Files-ul.90.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Files to project The Trunk: http://source.squeak.org/trunk/Files-ul.90.mcz ==================== Summary ==================== Name: Files-ul.90 Author: ul Time: 27 September 2010, 3:56:36.551 am UUID: aff6ed6c-5823-6342-b175-65f0f4e8f403 Ancestors: Files-ul.89 - Integrated Eliot's stdio changes with a minor fix/optimization =============== Diff against Files-ul.89 =============== Item was added: + ----- Method: CrLfFileStream class>>newForStdio (in category 'instance creation') ----- + newForStdio + "Circumvent CrLfFileStream new's retuning an instance of MultiBteFileStream" + ^super new! Item was added: + ----- Method: CrLfFileStream>>openOnHandle:name:forWrite: (in category 'open/close') ----- + openOnHandle: aFileID name: streamName forWrite: writeMode + "Initialize the file with the given handle. If writeMode is true then + allow writing, otherwise put the file in read-only mode." + super openOnHandle: aFileID name: streamName forWrite: writeMode. + lineEndConvention := LineEndDefault! Item was changed: ----- Method: DirectoryEntry>>fullName (in category 'access') ----- fullName + "The fully-qualified name. + Since this method falls into the equality test, make it safe when directory is nil." + ^ directory + ifNotNil: [ directory fullNameFor: self name ] + ifNil: [ self name ]! - "The fully-qualified name." - ^ directory fullNameFor: self name! Item was added: + ----- Method: FileDirectory>>directoryEntryForName: (in category 'private') ----- + directoryEntryForName: aFileName + + "Return a single DirectoryEntry for the given (non-path) entry name, + or nil if the entry could not be found. + Raises InvalidDirectoryError if this directory's path does not identify a directory." + + | entryArray sysPath sysName | + + sysPath := pathName asVmPathName. + sysName := aFileName asVmPathName. + + "New linear-time primitive." + entryArray := self primLookupEntryIn: sysPath name: sysName. + entryArray == #primFailed ifFalse:[ + ^ entryArray ifNotNil: [(DirectoryEntry fromArray: entryArray directory: self) convertFromSystemName] + ]. + + "If the new primitive fails, use the old slow method. + (This fallback can be changed to signal InvalidDirectoryError once + VM's with FilePlugin #primitiveDirectoryEntry have been distributed everywhere; + the new primitive was introduced 6/13/2007." + + ^self isCaseSensitive ifTrue: [ + self entries detect: [:entry | entry name = aFileName ] ifNone: [ nil ] + ] ifFalse: [ + self entries detect: [:entry | entry name sameAs: aFileName ] ifNone: [ nil ] + ] + ! Item was changed: FileStream subclass: #StandardFileStream instanceVariableNames: 'name fileID buffer1' + classVariableNames: 'Registry StdioHandles' - classVariableNames: 'Registry' poolDictionaries: '' category: 'Files-Kernel'! + StandardFileStream class + instanceVariableNames: 'stdioFiles'! !StandardFileStream commentStamp: 'ul 12/6/2009 05:13' prior: 0! Provides a simple, platform-independent, interface to a file system. The instance variable rwmode, inherited from class PositionableStream, here is used to hold a Boolean -- true means opened for read-write, false means opened for read-only. 2/12/96 sw I implement a simple read buffering scheme with the variables defined in PositionableStream (which are unused in me otherwise) in the following way: collection <ByteString> or <ByteArray> This is the buffer. position <Integer> The relative position in the buffer. Greater or equal to zero. readLimit <Integer> The number of bytes buffered. Greater or equal to zero. Read buffering is enabled with #enableReadBuffering, disabled with #disableReadBuffering and it is enabled by default. The buffer is filled when a read attempt of an unbuffered absolute position is requested, or when a negative repositioning is made (with #position: with an argument < than the current absolute position) to an absolute position which is not buffered. In the first case, the buffer is positioned to the given absolute position. In the latter case the repositioning is made to the requested absolute position minus fourth of the buffer size. This means that further small negative repositionings won't result in buffer flushing. This is really useful when filing in code. The read buffer is flushed (#flushReadBuffer) whenever a write attempt is made. The buffer state is valid if and only if collection is not nil and position < readLimit.! + StandardFileStream class + instanceVariableNames: 'stdioFiles'! Item was changed: ----- Method: StandardFileStream class>>fileExistsUserHandling: (in category 'error handling') ----- fileExistsUserHandling: fullFileName | dir localName choice newName newFullFileName | dir := FileDirectory forFileName: fullFileName. localName := FileDirectory localNameFor: fullFileName. + choice := (UIManager default + chooseFrom: #('overwrite that file' 'append (risky!!!!)' 'choose another name' 'cancel') + title: localName, ' already exists.'). - choice := UIManager default chooseFrom:{ - 'overwrite that file'. - 'choose another name'. - 'cancel' - } title: localName, ' - already exists.'. choice = 1 ifTrue: [ dir deleteFileNamed: localName ifAbsent: [self error: 'Could not delete the old version of that file']. ^ self new open: fullFileName forWrite: true]. choice = 2 ifTrue: [ + ^ (self new open: fullFileName forWrite: true) setToEnd]. + + choice = 3 ifTrue: [ newName := UIManager default request: 'Enter a new file name' initialAnswer: fullFileName. newFullFileName := self fullName: newName. ^ self newFileNamed: newFullFileName]. self error: 'Please close this to abort file opening'! Item was added: + ----- Method: StandardFileStream class>>flushAndVoidStdioFiles (in category 'class initialization') ----- + flushAndVoidStdioFiles + stdioFiles ifNotNil: + [stdioFiles do: + [:f| f isReadOnly ifFalse: [[f flush] on: Error do: [:ex|"care less"]]]. + stdioFiles := nil]! Item was added: + ----- Method: StandardFileStream class>>initialize (in category 'class initialization') ----- + initialize + "StandardFileStream initialize" + StdioHandles := Array new: 3. + Smalltalk + addToStartUpList: self after: SecurityManager; "the intent being before: AutoStart" + addToShutDownList: self after: SecurityManager! Item was added: + ----- Method: StandardFileStream class>>newForStdio (in category 'private-file creation') ----- + newForStdio + "Circumvent CrLfFileStream new's returning an instance of MultiBteFileStream" + ^self new! Item was added: + ----- Method: StandardFileStream class>>shutDown: (in category 'class initialization') ----- + shutDown: quitting + quitting ifTrue: + [self withAllSubclassesDo: + [:fileStreamClass| fileStreamClass flushAndVoidStdioFiles]]! Item was added: + ----- Method: StandardFileStream class>>standardIOStreamNamed:forWrite: (in category 'private-file creation') ----- + standardIOStreamNamed: moniker forWrite: forWrite + + | index | + index := #(stdin stdout stderr) identityIndexOf: moniker. + ^((stdioFiles ifNil: [ stdioFiles := Array new: 3 ]) at: index) + ifNil: [ + stdioFiles + at: index + put: ( + (StdioHandles at: index) + ifNil: [ ^self error: moniker, ' is unavailable' ] + ifNotNil: [ :handle| + self newForStdio + openOnHandle: handle + name: moniker + forWrite: forWrite ]) ]! Item was added: + ----- Method: StandardFileStream class>>startUp: (in category 'class initialization') ----- + startUp: resuming + (resuming and: [self == StandardFileStream]) ifTrue: + [self withAllSubclassesDo: + [:fileStreamClass| fileStreamClass voidStdioFiles]. + [StdioHandles := self stdioHandles] + on: Error + do: [:ex| + StdioHandles isArray ifFalse: + [StdioHandles := Array new: 3]]]! Item was added: + ----- Method: StandardFileStream class>>stderr (in category 'file creation') ----- + stderr + ^self standardIOStreamNamed: #stderr forWrite: true! Item was added: + ----- Method: StandardFileStream class>>stdin (in category 'file creation') ----- + stdin + ^self standardIOStreamNamed: #stdin forWrite: false! Item was added: + ----- Method: StandardFileStream class>>stdioHandles (in category 'private-file creation') ----- + stdioHandles + <primitive: 'primitiveFileStdioHandles' module: 'FilePlugin' error: ec> + self primitiveFailed! Item was added: + ----- Method: StandardFileStream class>>stdout (in category 'file creation') ----- + stdout + ^self standardIOStreamNamed: #stdout forWrite: true! Item was added: + ----- Method: StandardFileStream class>>voidStdioFiles (in category 'class initialization') ----- + voidStdioFiles + stdioFiles := nil! Item was added: + ----- Method: StandardFileStream>>openOnHandle:name:forWrite: (in category 'open/close') ----- + openOnHandle: aFileID name: streamName forWrite: writeMode + "Initialize the file with the given handle. If writeMode is true then + allow writing, otherwise put the file in read-only mode. + N.B. Do _not_ register the stream. We do not want it to be + closed implicitly (e.g. on GC). There may be multiple instances + accessing the same stream. The stream is not a file." + fileID := aFileID. + name := streamName. + rwmode := writeMode. + buffer1 := String new: 1. + self enableReadBuffering!

1 0

The Trunk: Sound-ul.26.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Sound to project The Trunk: http://source.squeak.org/trunk/Sound-ul.26.mcz ==================== Summary ==================== Name: Sound-ul.26 Author: ul Time: 2 November 2010, 3:14:00.064 am UUID: c8c0166b-85f4-9447-a360-c520fa1e4876 Ancestors: Sound-dtl.25 - use paragma declarations for #inline: and #var:declareC: =============== Diff against Sound-dtl.25 =============== Item was changed: ----- Method: ADPCMCodec>>indexForDeltaFrom:to: (in category 'private') ----- indexForDeltaFrom: thisSample to: nextSample "Answer the best index to use for the difference between the given samples." "Details: Scan stepSizeTable for the first entry >= the absolute value of the difference between sample values. Since indexes are zero-based, the index used during decoding will be the one in the following stepSizeTable entry. Since the index field of a Flash frame header is only six bits, the maximum index value is 63." "Note: Since there does not appear to be any documentation of how Flash actually computes the indices used in its frame headers, this algorithm was guessed by reverse-engineering the Flash ADPCM decoder." | diff bestIndex | + <inline: true> - self inline: true. diff := nextSample - thisSample. diff < 0 ifTrue: [diff := 0 - diff]. bestIndex := 63. 1 to: 62 do: [:j | bestIndex = 63 ifTrue: [ (stepSizeTable at: j) >= diff ifTrue: [bestIndex := j]]]. ^ bestIndex ! Item was changed: ----- Method: ADPCMCodec>>nextBits: (in category 'bit streaming') ----- nextBits: n "Answer the next n bits of my bit stream as an unsigned integer." | result remaining shift | + <inline: true> - self inline: true. result := 0. remaining := n. [true] whileTrue: [ shift := remaining - bitPosition. result := result + (currentByte bitShift: shift). shift > 0 ifTrue: [ "consumed currentByte buffer; fetch next byte" remaining := remaining - bitPosition. currentByte := (encodedBytes at: (byteIndex := byteIndex + 1)). bitPosition := 8] ifFalse: [ "still some bits left in currentByte buffer" bitPosition := bitPosition - remaining. "mask out the consumed bits:" currentByte := currentByte bitAnd: (255 bitShift: (bitPosition - 8)). ^ result]]. ! Item was changed: ----- Method: ADPCMCodec>>nextBits:put: (in category 'bit streaming') ----- nextBits: n put: anInteger "Write the next n bits to my bit stream." | buf bufBits bitsAvailable shift | + <inline: true> - self inline: true. buf := anInteger. bufBits := n. [true] whileTrue: [ bitsAvailable := 8 - bitPosition. shift := bitsAvailable - bufBits. "either left or right shift" "append high bits of buf to end of currentByte:" currentByte := currentByte + (buf bitShift: shift). shift < 0 ifTrue: [ "currentByte buffer filled; output it" encodedBytes at: (byteIndex := byteIndex + 1) put: currentByte. bitPosition := 0. currentByte := 0. "clear saved high bits of buf:" buf := buf bitAnd: (1 bitShift: 0 - shift) - 1. bufBits := bufBits - bitsAvailable] ifFalse: [ "still some bits available in currentByte buffer" bitPosition := bitPosition + bufBits. ^ self]]. ! Item was changed: ----- Method: ADPCMCodec>>privateDecodeMono: (in category 'private') ----- privateDecodeMono: count | delta step predictedDelta bit | <primitive: 'primitiveDecodeMono' module: 'ADPCMCodecPlugin'> + <var: #stepSizeTable declareC: 'short int *stepSizeTable'> + <var: #indexTable declareC: 'short int *indexTable'> + <var: #samples declareC: 'short int *samples'> + <var: #encodedBytes declareC: 'unsigned char *encodedBytes'> - self var: #stepSizeTable declareC: 'short int *stepSizeTable'. - self var: #indexTable declareC: 'short int *indexTable'. - self var: #samples declareC: 'short int *samples'. - self var: #encodedBytes declareC: 'unsigned char *encodedBytes'. 1 to: count do: [:i | (i bitAnd: frameSizeMask) = 1 ifTrue: [ "start of frame; read frame header" predicted := self nextBits: 16. predicted > 32767 ifTrue: [predicted := predicted - 65536]. index := self nextBits: 6. samples at: (sampleIndex := sampleIndex + 1) put: predicted] ifFalse: [ delta := self nextBits: bitsPerSample. step := stepSizeTable at: index + 1. predictedDelta := 0. bit := deltaValueHighBit. [bit > 0] whileTrue: [ (delta bitAnd: bit) > 0 ifTrue: [predictedDelta := predictedDelta + step]. step := step bitShift: -1. bit := bit bitShift: -1]. predictedDelta := predictedDelta + step. (delta bitAnd: deltaSignMask) > 0 ifTrue: [predicted := predicted - predictedDelta] ifFalse: [predicted := predicted + predictedDelta]. predicted > 32767 ifTrue: [predicted := 32767] ifFalse: [predicted < -32768 ifTrue: [predicted := -32768]]. index := index + (indexTable at: (delta bitAnd: deltaValueMask) + 1). index < 0 ifTrue: [index := 0] ifFalse: [index > 88 ifTrue: [index := 88]]. samples at: (sampleIndex := sampleIndex + 1) put: predicted]]. ! Item was changed: ----- Method: ADPCMCodec>>privateDecodeStereo: (in category 'private') ----- privateDecodeStereo: count | predictedLeft predictedRight indexLeft indexRight deltaLeft deltaRight stepLeft stepRight predictedDeltaLeft predictedDeltaRight bit | <primitive: 'primitiveDecodeStereo' module: 'ADPCMCodecPlugin'> + <var: #stepSizeTable declareC: 'short int *stepSizeTable'> + <var: #indexTable declareC: 'short int *indexTable'> + <var: #samples declareC: 'short int *samples'> + <var: #encodedBytes declareC: 'unsigned char *encodedBytes'> + <var: #rightSamples declareC: 'short int *rightSamples'> + <var: #predicted declareC: 'short int *predicted'> + <var: #index declareC: 'short int *index'> - self var: #stepSizeTable declareC: 'short int *stepSizeTable'. - self var: #indexTable declareC: 'short int *indexTable'. - self var: #samples declareC: 'short int *samples'. - self var: #encodedBytes declareC: 'unsigned char *encodedBytes'. - self var: #rightSamples declareC: 'short int *rightSamples'. - self var: #predicted declareC: 'short int *predicted'. - self var: #index declareC: 'short int *index'. "make local copies of decoder state variables" predictedLeft := predicted at: 1. predictedRight := predicted at: 2. indexLeft := index at: 1. indexRight := index at: 2. 1 to: count do: [:i | (i bitAnd: frameSizeMask) = 1 ifTrue: [ "start of frame; read frame header" predictedLeft := self nextBits: 16. indexLeft := self nextBits: 6. predictedRight := self nextBits: 16. indexRight := self nextBits: 6. predictedLeft > 32767 ifTrue: [predictedLeft := predictedLeft - 65536]. predictedRight > 32767 ifTrue: [predictedRight := predictedRight - 65536]. samples at: (sampleIndex := sampleIndex + 1) put: predictedLeft. rightSamples at: sampleIndex put: predictedRight] ifFalse: [ deltaLeft := self nextBits: bitsPerSample. deltaRight := self nextBits: bitsPerSample. stepLeft := stepSizeTable at: indexLeft + 1. stepRight := stepSizeTable at: indexRight + 1. predictedDeltaLeft := predictedDeltaRight := 0. bit := deltaValueHighBit. [bit > 0] whileTrue: [ (deltaLeft bitAnd: bit) > 0 ifTrue: [ predictedDeltaLeft := predictedDeltaLeft + stepLeft]. (deltaRight bitAnd: bit) > 0 ifTrue: [ predictedDeltaRight := predictedDeltaRight + stepRight]. stepLeft := stepLeft bitShift: -1. stepRight := stepRight bitShift: -1. bit := bit bitShift: -1]. predictedDeltaLeft := predictedDeltaLeft + stepLeft. predictedDeltaRight := predictedDeltaRight + stepRight. (deltaLeft bitAnd: deltaSignMask) > 0 ifTrue: [predictedLeft := predictedLeft - predictedDeltaLeft] ifFalse: [predictedLeft := predictedLeft + predictedDeltaLeft]. (deltaRight bitAnd: deltaSignMask) > 0 ifTrue: [predictedRight := predictedRight - predictedDeltaRight] ifFalse: [predictedRight := predictedRight + predictedDeltaRight]. predictedLeft > 32767 ifTrue: [predictedLeft := 32767] ifFalse: [predictedLeft < -32768 ifTrue: [predictedLeft := -32768]]. predictedRight > 32767 ifTrue: [predictedRight := 32767] ifFalse: [predictedRight < -32768 ifTrue: [predictedRight := -32768]]. indexLeft := indexLeft + (indexTable at: (deltaLeft bitAnd: deltaValueMask) + 1). indexLeft < 0 ifTrue: [indexLeft := 0] ifFalse: [indexLeft > 88 ifTrue: [indexLeft := 88]]. indexRight := indexRight + (indexTable at: (deltaRight bitAnd: deltaValueMask) + 1). indexRight < 0 ifTrue: [indexRight := 0] ifFalse: [indexRight > 88 ifTrue: [indexRight := 88]]. samples at: (sampleIndex := sampleIndex + 1) put: predictedLeft. rightSamples at: sampleIndex put: predictedRight]]. "save local copies of decoder state variables" predicted at: 1 put: predictedLeft. predicted at: 2 put: predictedRight. index at: 1 put: indexLeft. index at: 2 put: indexRight. ! Item was changed: ----- Method: ADPCMCodec>>privateEncodeMono: (in category 'private') ----- privateEncodeMono: count | step sign diff delta predictedDelta bit p | <primitive: 'primitiveEncodeMono' module: 'ADPCMCodecPlugin'> + <var: #stepSizeTable declareC: 'short int *stepSizeTable'> + <var: #indexTable declareC: 'short int *indexTable'> + <var: #samples declareC: 'short int *samples'> + <var: #encodedBytes declareC: 'unsigned char *encodedBytes'> - self var: #stepSizeTable declareC: 'short int *stepSizeTable'. - self var: #indexTable declareC: 'short int *indexTable'. - self var: #samples declareC: 'short int *samples'. - self var: #encodedBytes declareC: 'unsigned char *encodedBytes'. step := stepSizeTable at: 1. 1 to: count do: [:i | (i bitAnd: frameSizeMask) = 1 ifTrue: [ predicted := samples at: (sampleIndex := sampleIndex + 1). (p := predicted) < 0 ifTrue: [p := p + 65536]. self nextBits: 16 put: p. i < count ifTrue: [ index := self indexForDeltaFrom: predicted to: (samples at: sampleIndex + 1)]. self nextBits: 6 put: index. ] ifFalse: [ "compute sign and magnitude of difference from the predicted sample" sign := 0. diff := (samples at: (sampleIndex := sampleIndex + 1)) - predicted. diff < 0 ifTrue: [ sign := deltaSignMask. diff := 0 - diff]. "Compute encoded delta and the difference that this will cause in the predicted sample value during decoding. Note that this code approximates: delta := (4 * diff) / step. predictedDelta := ((delta + 0.5) * step) / 4; but in the shift step bits are dropped. Thus, even if you have fast mul/div hardware you cannot use it since you would get slightly different bits what than the algorithm defines." delta := 0. predictedDelta := 0. bit := deltaValueHighBit. [bit > 0] whileTrue: [ diff >= step ifTrue: [ delta := delta + bit. predictedDelta := predictedDelta + step. diff := diff - step]. step := step bitShift: -1. bit := bit bitShift: -1]. predictedDelta := predictedDelta + step. "compute and clamp new prediction" sign > 0 ifTrue: [predicted := predicted - predictedDelta] ifFalse: [predicted := predicted + predictedDelta]. predicted > 32767 ifTrue: [predicted := 32767] ifFalse: [predicted < -32768 ifTrue: [predicted := -32768]]. "compute new index and step values" index := index + (indexTable at: delta + 1). index < 0 ifTrue: [index := 0] ifFalse: [index > 88 ifTrue: [index := 88]]. step := stepSizeTable at: index + 1. "output encoded, signed delta" self nextBits: bitsPerSample put: (sign bitOr: delta)]]. bitPosition > 0 ifTrue: [ "flush the last output byte, if necessary" encodedBytes at: (byteIndex := byteIndex + 1) put: currentByte]. ! Item was changed: ----- Method: ADPCMCodec>>privateEncodeStereo: (in category 'private') ----- privateEncodeStereo: count <primitive: 'primitiveEncodeStereo' module: 'ADPCMCodecPlugin'> + <inline: false> "not yet implemented" - self inline: false. self success: false.! Item was changed: ----- Method: FMSound>>mixSampleCount:into:startingAt:leftVol:rightVol: (in category 'sound generation') ----- mixSampleCount: n into: aSoundBuffer startingAt: startIndex leftVol: leftVol rightVol: rightVol "Play samples from a wave table by stepping a fixed amount through the table on every sample. The table index and increment are scaled to allow fractional increments for greater pitch accuracy." "(FMSound pitch: 440.0 dur: 1.0 loudness: 0.5) play" | doingFM lastIndex sample offset i s | <primitive:'primitiveMixFMSound' module:'SoundGenerationPlugin'> + <var: #aSoundBuffer declareC: 'short int *aSoundBuffer'> + <var: #waveTable declareC: 'short int *waveTable'> - self var: #aSoundBuffer declareC: 'short int *aSoundBuffer'. - self var: #waveTable declareC: 'short int *waveTable'. doingFM := (normalizedModulation ~= 0) and: [scaledOffsetIndexIncr ~= 0]. lastIndex := (startIndex + n) - 1. startIndex to: lastIndex do: [:sliceIndex | sample := (scaledVol * (waveTable at: (scaledIndex // ScaleFactor) + 1)) // ScaleFactor. doingFM ifTrue: [ offset := normalizedModulation * (waveTable at: (scaledOffsetIndex // ScaleFactor) + 1). scaledOffsetIndex := (scaledOffsetIndex + scaledOffsetIndexIncr) \\ scaledWaveTableSize. scaledOffsetIndex < 0 ifTrue: [scaledOffsetIndex := scaledOffsetIndex + scaledWaveTableSize]. scaledIndex := (scaledIndex + scaledIndexIncr + offset) \\ scaledWaveTableSize. scaledIndex < 0 ifTrue: [scaledIndex := scaledIndex + scaledWaveTableSize]] ifFalse: [ scaledIndex := (scaledIndex + scaledIndexIncr) \\ scaledWaveTableSize]. leftVol > 0 ifTrue: [ i := (2 * sliceIndex) - 1. s := (aSoundBuffer at: i) + ((sample * leftVol) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. rightVol > 0 ifTrue: [ i := 2 * sliceIndex. s := (aSoundBuffer at: i) + ((sample * rightVol) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. scaledVolIncr ~= 0 ifTrue: [ scaledVol := scaledVol + scaledVolIncr. ((scaledVolIncr > 0 and: [scaledVol >= scaledVolLimit]) or: [scaledVolIncr < 0 and: [scaledVol <= scaledVolLimit]]) ifTrue: [ "reached the limit; stop incrementing" scaledVol := scaledVolLimit. scaledVolIncr := 0]]]. count := count - n. ! Item was changed: ----- Method: LoopedSampledSound>>mixSampleCount:into:startingAt:leftVol:rightVol: (in category 'sound generation') ----- mixSampleCount: n into: aSoundBuffer startingAt: startIndex leftVol: leftVol rightVol: rightVol "Play samples from a wave table by stepping a fixed amount through the table on every sample. The table index and increment are scaled to allow fractional increments for greater pitch accuracy. If a loop length is specified, then the index is looped back when the loopEnd index is reached until count drops below releaseCount. This allows a short sampled sound to be sustained indefinitely." "(LoopedSampledSound pitch: 440.0 dur: 5.0 loudness: 0.5) play" | lastIndex sampleIndex i s compositeLeftVol compositeRightVol nextSampleIndex m isInStereo rightVal leftVal | <primitive:'primitiveMixLoopedSampledSound' module:'SoundGenerationPlugin'> + <var: #aSoundBuffer declareC: 'short int *aSoundBuffer'> + <var: #leftSamples declareC: 'short int *leftSamples'> + <var: #rightSamples declareC: 'short int *rightSamples'> - self var: #aSoundBuffer declareC: 'short int *aSoundBuffer'. - self var: #leftSamples declareC: 'short int *leftSamples'. - self var: #rightSamples declareC: 'short int *rightSamples'. isInStereo := leftSamples ~~ rightSamples. compositeLeftVol := (leftVol * scaledVol) // ScaleFactor. compositeRightVol := (rightVol * scaledVol) // ScaleFactor. i := (2 * startIndex) - 1. lastIndex := (startIndex + n) - 1. startIndex to: lastIndex do: [:sliceIndex | sampleIndex := (scaledIndex := scaledIndex + scaledIndexIncr) // LoopIndexScaleFactor. ((sampleIndex > loopEnd) and: [count > releaseCount]) ifTrue: [ "loop back if not within releaseCount of the note end" "note: unlooped sounds will have loopEnd = lastSample" sampleIndex := (scaledIndex := scaledIndex - scaledLoopLength) // LoopIndexScaleFactor]. (nextSampleIndex := sampleIndex + 1) > lastSample ifTrue: [ sampleIndex > lastSample ifTrue: [count := 0. ^ nil]. "done!!" scaledLoopLength = 0 ifTrue: [nextSampleIndex := sampleIndex] ifFalse: [nextSampleIndex := ((scaledIndex - scaledLoopLength) // LoopIndexScaleFactor) + 1]]. m := scaledIndex bitAnd: LoopIndexFractionMask. rightVal := leftVal := (((leftSamples at: sampleIndex) * (LoopIndexScaleFactor - m)) + ((leftSamples at: nextSampleIndex) * m)) // LoopIndexScaleFactor. isInStereo ifTrue: [ rightVal := (((rightSamples at: sampleIndex) * (LoopIndexScaleFactor - m)) + ((rightSamples at: nextSampleIndex) * m)) // LoopIndexScaleFactor]. leftVol > 0 ifTrue: [ s := (aSoundBuffer at: i) + ((compositeLeftVol * leftVal) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. i := i + 1. rightVol > 0 ifTrue: [ s := (aSoundBuffer at: i) + ((compositeRightVol * rightVal) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. i := i + 1. scaledVolIncr ~= 0 ifTrue: [ "update volume envelope if it is changing" scaledVol := scaledVol + scaledVolIncr. ((scaledVolIncr > 0 and: [scaledVol >= scaledVolLimit]) or: [scaledVolIncr < 0 and: [scaledVol <= scaledVolLimit]]) ifTrue: [ "reached the limit; stop incrementing" scaledVol := scaledVolLimit. scaledVolIncr := 0]. compositeLeftVol := (leftVol * scaledVol) // ScaleFactor. compositeRightVol := (rightVol * scaledVol) // ScaleFactor]]. count := count - n. ! Item was changed: ----- Method: PluckedSound>>mixSampleCount:into:startingAt:leftVol:rightVol: (in category 'sound generation') ----- mixSampleCount: n into: aSoundBuffer startingAt: startIndex leftVol: leftVol rightVol: rightVol "The Karplus-Strong plucked string algorithm: start with a buffer full of random noise and repeatedly play the contents of that buffer while averaging adjacent samples. High harmonics damp out more quickly, transfering their energy to lower ones. The length of the buffer corresponds to the length of the string." "(PluckedSound pitch: 220.0 dur: 6.0 loudness: 0.8) play" | lastIndex scaledThisIndex scaledNextIndex average sample i s | <primitive:'primitiveMixPluckedSound' module:'SoundGenerationPlugin'> + <var: #aSoundBuffer declareC: 'short int *aSoundBuffer'> + <var: #ring declareC: 'short int *ring'> - self var: #aSoundBuffer declareC: 'short int *aSoundBuffer'. - self var: #ring declareC: 'short int *ring'. lastIndex := (startIndex + n) - 1. scaledThisIndex := scaledNextIndex := scaledIndex. startIndex to: lastIndex do: [:sliceIndex | scaledNextIndex := scaledThisIndex + scaledIndexIncr. scaledNextIndex >= scaledIndexLimit ifTrue: [scaledNextIndex := ScaleFactor + (scaledNextIndex - scaledIndexLimit)]. average := ((ring at: scaledThisIndex // ScaleFactor) + (ring at: scaledNextIndex // ScaleFactor)) // 2. ring at: scaledThisIndex // ScaleFactor put: average. sample := (average * scaledVol) // ScaleFactor. "scale by volume" scaledThisIndex := scaledNextIndex. leftVol > 0 ifTrue: [ i := (2 * sliceIndex) - 1. s := (aSoundBuffer at: i) + ((sample * leftVol) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. rightVol > 0 ifTrue: [ i := 2 * sliceIndex. s := (aSoundBuffer at: i) + ((sample * rightVol) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. scaledVolIncr ~= 0 ifTrue: [ scaledVol := scaledVol + scaledVolIncr. ((scaledVolIncr > 0 and: [scaledVol >= scaledVolLimit]) or: [scaledVolIncr < 0 and: [scaledVol <= scaledVolLimit]]) ifTrue: [ "reached the limit; stop incrementing" scaledVol := scaledVolLimit. scaledVolIncr := 0]]]. scaledIndex := scaledNextIndex. count := count - n. ! Item was changed: ----- Method: ReverbSound>>applyReverbTo:startingAt:count: (in category 'private') ----- applyReverbTo: aSoundBuffer startingAt: startIndex count: n | delayedLeft delayedRight i tapGain j out | <primitive: 'primitiveApplyReverb' module:'SoundGenerationPlugin'> + <var: #aSoundBuffer declareC: 'short int *aSoundBuffer'> + <var: #tapDelays declareC: 'int *tapDelays'> + <var: #tapGains declareC: 'int *tapGains'> + <var: #leftBuffer declareC: 'short int *leftBuffer'> + <var: #rightBuffer declareC: 'short int *rightBuffer'> - self var: #aSoundBuffer declareC: 'short int *aSoundBuffer'. - self var: #tapDelays declareC: 'int *tapDelays'. - self var: #tapGains declareC: 'int *tapGains'. - self var: #leftBuffer declareC: 'short int *leftBuffer'. - self var: #rightBuffer declareC: 'short int *rightBuffer'. startIndex to: ((startIndex + n) - 1) do: [:sliceIndex | delayedLeft := delayedRight := 0. 1 to: tapCount do: [:tapIndex | i := bufferIndex - (tapDelays at: tapIndex). i < 1 ifTrue: [i := i + bufferSize]. "wrap" tapGain := tapGains at: tapIndex. delayedLeft := delayedLeft + (tapGain * (leftBuffer at: i)). delayedRight := delayedRight + (tapGain * (rightBuffer at: i))]. "left channel" j := (2 * sliceIndex) - 1. out := (aSoundBuffer at: j) + (delayedLeft // ScaleFactor). out > 32767 ifTrue: [out := 32767]. "clipping!!" out < -32767 ifTrue: [out := -32767]. "clipping!!" aSoundBuffer at: j put: out. leftBuffer at: bufferIndex put: out. "right channel" j := j + 1. out := (aSoundBuffer at: j) + (delayedRight // ScaleFactor). out > 32767 ifTrue: [out := 32767]. "clipping!!" out < -32767 ifTrue: [out := -32767]. "clipping!!" aSoundBuffer at: j put: out. rightBuffer at: bufferIndex put: out. bufferIndex := (bufferIndex \\ bufferSize) + 1]. ! Item was changed: ----- Method: SampledSound>>mixSampleCount:into:startingAt:leftVol:rightVol: (in category 'playing') ----- mixSampleCount: n into: aSoundBuffer startingAt: startIndex leftVol: leftVol rightVol: rightVol "Mix the given number of samples with the samples already in the given buffer starting at the given index. Assume that the buffer size is at least (index + count) - 1." | lastIndex outIndex sampleIndex sample i s overflow | <primitive:'primitiveMixSampledSound' module:'SoundGenerationPlugin'> + <var: #aSoundBuffer declareC: 'short int *aSoundBuffer'> + <var: #samples declareC: 'short int *samples'> - self var: #aSoundBuffer declareC: 'short int *aSoundBuffer'. - self var: #samples declareC: 'short int *samples'. lastIndex := (startIndex + n) - 1. outIndex := startIndex. "index of next stereo output sample pair" sampleIndex := indexHighBits + (scaledIndex >> IncrementFractionBits). [(sampleIndex <= samplesSize) and: [outIndex <= lastIndex]] whileTrue: [ sample := ((samples at: sampleIndex) * scaledVol) // ScaleFactor. leftVol > 0 ifTrue: [ i := (2 * outIndex) - 1. s := (aSoundBuffer at: i) + ((sample * leftVol) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. rightVol > 0 ifTrue: [ i := 2 * outIndex. s := (aSoundBuffer at: i) + ((sample * rightVol) // ScaleFactor). s > 32767 ifTrue: [s := 32767]. "clipping!!" s < -32767 ifTrue: [s := -32767]. "clipping!!" aSoundBuffer at: i put: s]. scaledVolIncr ~= 0 ifTrue: [ scaledVol := scaledVol + scaledVolIncr. ((scaledVolIncr > 0 and: [scaledVol >= scaledVolLimit]) or: [scaledVolIncr < 0 and: [scaledVol <= scaledVolLimit]]) ifTrue: [ "reached the limit; stop incrementing" scaledVol := scaledVolLimit. scaledVolIncr := 0]]. scaledIndex := scaledIndex + scaledIncrement. scaledIndex >= ScaledIndexOverflow ifTrue: [ overflow := scaledIndex >> IncrementFractionBits. indexHighBits := indexHighBits + overflow. scaledIndex := scaledIndex - (overflow << IncrementFractionBits)]. sampleIndex := indexHighBits + (scaledIndex >> IncrementFractionBits). outIndex := outIndex + 1]. count := count - n. !

1 0

The Trunk: Graphics-ul.152.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-ul.152.mcz ==================== Summary ==================== Name: Graphics-ul.152 Author: ul Time: 2 November 2010, 3:12:47.835 am UUID: f2a5386f-5f44-5f45-a35c-1dab7538fb00 Ancestors: Graphics-dtl.151 - use paragma declarations for #inline: and #var:declareC: =============== Diff against Graphics-dtl.151 =============== Item was changed: ----- Method: WarpBlt>>rgbMap:from:to: (in category 'smoothing') ----- rgbMap: sourcePixel from: nBitsIn to: nBitsOut "NOTE: This code is copied verbatim from BitBltSimulation so that it may be removed from the system" "Convert the given pixel value with nBitsIn bits for each color component to a pixel value with nBitsOut bits for each color component. Typical values for nBitsIn/nBitsOut are 3, 5, or 8." | mask d srcPix destPix | + <inline: true> - self inline: true. (d := nBitsOut - nBitsIn) > 0 ifTrue: ["Expand to more bits by zero-fill" mask := (1 << nBitsIn) - 1. "Transfer mask" srcPix := sourcePixel << d. mask := mask << d. destPix := srcPix bitAnd: mask. mask := mask << nBitsOut. srcPix := srcPix << d. ^ destPix + (srcPix bitAnd: mask) + (srcPix << d bitAnd: mask << nBitsOut)] ifFalse: ["Compress to fewer bits by truncation" d = 0 ifTrue: [^ sourcePixel]. "no compression" sourcePixel = 0 ifTrue: [^ sourcePixel]. "always map 0 (transparent) to 0" d := nBitsIn - nBitsOut. mask := (1 << nBitsOut) - 1. "Transfer mask" srcPix := sourcePixel >> d. destPix := srcPix bitAnd: mask. mask := mask << nBitsOut. srcPix := srcPix >> d. destPix := destPix + (srcPix bitAnd: mask) + (srcPix >> d bitAnd: mask << nBitsOut). destPix = 0 ifTrue: [^ 1]. "Dont fall into transparent by truncation" ^ destPix]!

1 0

The Trunk: Collections-ul.400.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.400.mcz ==================== Summary ==================== Name: Collections-ul.400 Author: ul Time: 2 November 2010, 3:12:07.581 am UUID: 747015e4-a721-7745-982e-7f9df814845d Ancestors: Collections-ul.399 - use paragma declarations for #inline: and #var:declareC: =============== Diff against Collections-ul.399 =============== Item was changed: ----- Method: ByteString class>>stringHash:initialHash: (in category 'primitives') ----- stringHash: aString initialHash: speciesHash | stringSize hash low | <primitive: 'primitiveStringHash' module: 'MiscPrimitivePlugin'> + <var: #aHash declareC: 'int speciesHash'> + <var: #aString declareC: 'unsigned char *aString'> - self var: #aHash declareC: 'int speciesHash'. - self var: #aString declareC: 'unsigned char *aString'. stringSize := aString size. hash := speciesHash bitAnd: 16rFFFFFFF. 1 to: stringSize do: [:pos | hash := hash + (aString at: pos) asciiValue. "Begin hashMultiply" low := hash bitAnd: 16383. hash := (16r260D * low + ((16r260D * (hash bitShift: -14) + (16r0065 * low) bitAnd: 16383) * 16384)) bitAnd: 16r0FFFFFFF. ]. ^ hash!

1 0

The Trunk: Tools-ul.275.mcz
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Levente Uzonyi uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-ul.275.mcz ==================== Summary ==================== Name: Tools-ul.275 Author: ul Time: 2 November 2010, 1:22:22.534 am UUID: d003e353-6573-484e-b6f6-8e337da6d123 Ancestors: Tools-ul.274 - fix: copy class instance variables and class comments when creating a copy of a class =============== Diff against Tools-ul.274 =============== Item was changed: ----- Method: Browser>>copyClass (in category 'class functions') ----- copyClass + | originalClass originalName copysName | - | originalName copysName oldDefinition newDefinition | classListIndex = 0 ifTrue: [^ self]. self okToChange ifFalse: [^ self]. + originalClass := self selectedClass. + originalName := originalClass name. - originalName := self selectedClass name. copysName := self request: 'Please type new class name' initialAnswer: originalName. copysName = '' ifTrue: [^ self]. " Cancel returns '' " copysName := copysName asSymbol. copysName = originalName ifTrue: [^ self]. (Smalltalk hasClassNamed: copysName) ifTrue: [^ self error: copysName , ' already exists']. + Cursor wait showWhile: [ + | newDefinition newMetaDefinition newClass | + newDefinition := originalClass definition + copyReplaceAll: originalName printString + with: copysName printString. + newClass := Compiler evaluate: newDefinition logged: true. + newMetaDefinition := originalClass class definition + copyReplaceAll: originalClass class name + with: newClass class name. + Compiler evaluate: newMetaDefinition logged: true. + newClass copyAllCategoriesFrom: originalClass. + newClass class copyAllCategoriesFrom: originalClass class. + originalClass hasComment ifTrue: [ + newClass comment: originalClass comment ] ]. - oldDefinition := self selectedClass definition. - newDefinition := oldDefinition copyReplaceAll: '#' , originalName asString with: '#' , copysName asString. - Cursor wait - showWhile: [| class | - class := Compiler evaluate: newDefinition logged: true. - class copyAllCategoriesFrom: (Smalltalk at: originalName). - class class copyAllCategoriesFrom: (Smalltalk at: originalName) class]. self classListIndex: 0. self changed: #classList!

1 0

Daily Commit Log
by commits＠source.squeak.org 02 Nov '10

02 Nov '10

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2010-November/003870.h… Name: Kernel-nice.511 Ancestors: Kernel-nice.510 Correct the confusion radiansToDegrees/degreesToRadians Thanks Bert =============================================

1 0

Writing API for XML (WAX) - Bibliography example
by Hannes Hirzel 01 Nov '10

01 Nov '10

Hello I read the post by Stephane Ducasse about writing XML (see below) with a bibliography example. Recently I (re)-discovered the port to Squeak/Pharo of the Writing API for XML (WAX) (http://java.ociweb.com/mark/programming/WAX.html) and could put it to good use for writing an XML file a bit more complex than the bibliography example. >From the web site WAX has the following characteristics: * focuses on writing XML, not reading it * requires less code than other approaches * uses less memory than other approaches (because it outputs XML as each method is called rather than storing it in a DOM-like structure and outputting it later) * writes all XML node types * always outputs well-formed XML or throws an exception unless running in "trust me" mode * knows how to associate DTDs, XML Schemas and XSLT stylesheets with the XML it outputs * is well-suited for writing XML request and response messages for REST-based and SOAP-based services However I do not know how far these points apply to the Squeak/Pharo port. http://www.squeaksource.com/WAX It needs the VB Regex package (http://www.squeaksource.com/Regex) As an exercise I did the code to produce the example Stephane gave. It worked fine; see below. Regards Hannes ========================================================== WAX new stream: (FileStream newFileNamed: 'myBibliography.xml'); writeXMLDeclaration: #1.0; start: 'BDBase'; attr: 'date' value: '25 May 2010'; attr: 'note' value: 'nil'; start: 'bd'; attr: 'authors' value: 'Larcenet'; attr: 'editor' value: 'Dargaud'; attr: 'entryCreationDate' value: '25 March 2006'; attr: 'entryNumber' value: '1'; attr: 'number' value: '1'; attr: 'original' value: 'true'; attr: 'serie' value: 'Nic oumouk'; attr: 'serieComplete' value: 'false'; attr: 'title' value: 'Total souk pour nic oumouk'; attr: 'year' value: '2005'; end; start: 'bd'; attr: 'authors' value: 'Greg'; attr: 'editor' value: 'Dargaud'; attr: 'entryCreationDate' value: '5 May 2006'; attr: 'entryNumber' value: '2'; attr: 'notes' value: 'sur le 4eme de couv aventure a manhattan'; attr: 'number' value: '9'; attr: 'original' value: 'true'; attr: 'serie' value: 'Achille Talon'; attr: 'title' value: 'Les petits desseins d''Achille Talon'; attr: 'year' value: '1974'; end; start: 'bd'; attr: 'authors' value: 'Greg'; attr: 'editor' value: 'Dargaud'; attr: 'entryCreationDate' value: '5 May 2006'; attr: 'entryNumber' value: '3'; attr: 'notes' value: 'sur la couverture une histoire du journal tintin'; attr: 'number' value: '13'; attr: 'original' value: 'true'; attr: 'serie' value: 'Achille Talon'; attr: 'title' value: 'Pas de pitié pour Achille Talon'; attr: 'year' value: '1976'; end; end; close. ========================================================== Output <?xml version="1.0" encoding="UTF-8"?> <BDBase date="25 May 2010" note="nil"> <bd authors="Larcenet" editor="Dargaud" entryCreationDate="25 March 2006" entryNumber="1" number="1" original="true" serie="Nic oumouk" serieComplete="false" title="Total souk pour nic oumouk" year="2005"/> <bd authors="Greg" editor="Dargaud" entryCreationDate="5 May 2006" entryNumber="2" notes="sur le 4eme de couv aventure a manhattan" number="9" original="true" serie="Achille Talon" title="Les petits desseins d'Achille Talon" year="1974"/> <bd authors="Greg" editor="Dargaud" entryCreationDate="5 May 2006" entryNumber="3" notes="sur la couverture une histoire du journal tintin" number="13" original="true" serie="Achille Talon" title="Pas de pitié pour Achille Talon" year="1976"/> </BDBase> ========================================================== On 10/31/10, stephane ducasse <stephane.ducasse(a)free.fr> wrote: > How can I control that each of the node of my document get printed a cr at > its end? > > In the past I got that > > <?xml version="1.0" encoding="UTF-8" ?> > <BDBase date="25 May 2010" entriesNumber="2440" note="nil"> > <bd authors="Larcenet" editor="Dargaud" entryCreationDate="25 March 2006" > entryNumber="1" number="1" original="true" serie="Nic oumouk" > serieComplete="false" title="Total souk pour nic oumouk" year="2005"/> > <bd authors="Greg" editor="Dargaud" entryCreationDate="5 May 2006" > entryNumber="2" notes="sur le 4eme de couv aventure a manhattan" number="9" > original="true" serie="Achille Talon" title="Les petits desseins d'Achille > Talon" year="1974"/> > <bd authors="Greg" editor="Dargaud" entryCreationDate="5 May 2006" > entryNumber="3" notes="sur la couverture une histoire du journal tintin" > number="13" original="true" serie="Achille Talon" title="Pas de pitié pour > Achille Talon" year="1976"/> > <bd aut > > Now I get > > <?xml version="1.0" encoding="UTF-8"?><Base date="31 October 2010" > entriesNumber="2448" note="nil"><bd serieComplete="false" editor="Dargaud" > entryCreationDate="25 March 2006" entryNumber="1" authors="Larcenet" > title="Total souk pour nic oumouk" serie="Nic oumouk" original="true" > number="1" year="2005" /><bd serieComplete="false" editor="Dargaud" > entryCreationDate="5 May 2006" entryNumber="2" authors="Greg" title="Les > petits desseins d'Achille Talon" serie="Achille Talon" original="true" > notes="sur le 4eme de couv aventure a manhattan" number="9" year="1974" > /><bd serieComplete="false" editor="Dargaud" entryCreationDate="5 May 2006" > entryNumber="3" authors="Greg" title="Pas de pitié pour Achille Talon" > serie="Achille Talon" original="true" notes="sur la couverture une histoire > du journal tintin" number="13" year="1976" /><bd serieComplete="false" > editor="Dargaud" entryCreationDate="5 May 2006" entryNumber="4" > authors="Greg" title > > Thanks > > Stef >

1 0

Re: [squeak-dev] The Inbox: Tests-bp.99.mcz
by Bernhard Pieber 01 Nov '10

01 Nov '10

I just found out that doing MCWorkingCopy flushObsoletePackageInfos breaks the PackageDependencyTest. This fixes the test. It should only be loaded after the flushing, because without the flushing it breaks the test. :-/ The reason is that PackageInfos can overlap. There is an obsolete PackageInfo named 'PackageInfo' and a PackageInfo named 'PackageInfo-Base' Monticello knows about. The method PackageOrganizer>>packageOfClass:ifNone: does not deal with this potential overlapping. It just answers the obsolete one because it comes first in its list of packages. IMO the overlapping should be regarded as an error because it will probably lead to a lot of unintended side effects. Does anyone know a good reason for allowing overlapping PackageInfos? Cheers, Bernhard Am 31.10.2010 um 17:51 schrieb commits(a)source.squeak.org: > A new version of Tests was added to project The Inbox: > http://source.squeak.org/inbox/Tests-bp.99.mcz > > ==================== Summary ==================== > > Name: Tests-bp.99 > Author: bp > Time: 31 October 2010, 6:44:26.559 pm > UUID: d573b35d-7413-43c2-96f7-1c47d39d8f27 > Ancestors: Tests-ul.98 > > Fix dependencies on obsolete PackageInfos. > > =============== Diff against Tests-ul.98 =============== > > Item was changed: > ----- Method: PackageDependencyTest>>testMonticello (in category 'tests') ----- > testMonticello > self testPackage: 'Monticello' dependsExactlyOn: #( > Collections > Compiler > Compression > Exceptions > Files > Graphics > Kernel > Morphic > Network > + 'PackageInfo-Base' > - PackageInfo > System > Tests > 'ToolBuilder-Kernel' > 'ToolBuilder-Morphic' > Tools > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testMorphic (in category 'tests') ----- > testMorphic > self testPackage: 'Morphic' dependsExactlyOn: #( > Balloon > Collections > Compiler > EToys > Exceptions > Files > Graphics > Kernel > Monticello > MonticelloConfigurations > - 'Morphic-TrueType' "????" > MorphicExtras > Multilingual > Network > ST80 > Sound > System > 'ToolBuilder-Kernel' > 'ToolBuilder-Morphic' > Tools > TrueType > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testSUnitGUI (in category 'tests') ----- > testSUnitGUI > self testPackage: 'SUnitGUI' dependsExactlyOn: #( > Collections > Graphics > Kernel > + 'PackageInfo-Base' > - PackageInfo > SUnit > System > 'ToolBuilder-Kernel' > Tools > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testServices (in category 'tests') ----- > testServices > self testPackage: 'Services-Base' dependsExactlyOn: #( > Collections > Compiler > Exceptions > Graphics > Kernel > Morphic > + 'PackageInfo-Base' > - PackageInfo > PreferenceBrowser > System > 'ToolBuilder-Kernel' > Tools > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testSystem (in category 'tests') ----- > testSystem > self testPackage: 'System' dependsExactlyOn: #( > Collections > Balloon > Compiler > Compression > Exceptions > Files > Graphics > Kernel > Monticello > MonticelloConfigurations > Morphic > MorphicExtras > Multilingual > Network > + 'PackageInfo-Base' > - PackageInfo > Sound > 'ToolBuilder-Kernel' > Tools > TrueType > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testToolBuilderMVC (in category 'tests') ----- > testToolBuilderMVC > self testPackage: 'ToolBuilder-MVC' dependsExactlyOn: #( > Collections > Exceptions > Graphics > ST80 > - ToolBuilder > 'ToolBuilder-Kernel' > Tools > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testToolBuilderSUnit (in category 'tests') ----- > testToolBuilderSUnit > self testPackage: 'ToolBuilder-SUnit' dependsExactlyOn: #( > Collections > Kernel > - ToolBuilder > 'ToolBuilder-Kernel' > ).! > > Item was changed: > ----- Method: PackageDependencyTest>>testTools (in category 'tests') ----- > testTools > self testPackage: 'Tools' dependsExactlyOn: #( > Collections > Compiler > Compression > Exceptions > Files > Graphics > Kernel > Morphic > MorphicExtras > Multilingual > Network > + 'PackageInfo-Base' > - PackageInfo > ST80 > System > 'ToolBuilder-Kernel' > ).! > >

3 3

Jump to page: