Squeak-dev May 2019

squeak-dev@lists.squeakfoundation.org

36 participants
153 discussions

The Trunk: Kernel-mt.1239.mcz
by commits＠source.squeak.org 31 May '19

31 May '19

Marcel Taeumel uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-mt.1239.mcz ==================== Summary ==================== Name: Kernel-mt.1239 Author: mt Time: 31 May 2019, 11:49:05.536936 am UUID: c1b1ed0f-6055-e543-a389-510fea993ddb Ancestors: Kernel-cmm.1238, Kernel-cmfcmf.1216 Merge cmfcmf.1216 =============== Diff against Kernel-cmm.1238 =============== Item was changed: ----- Method: Random>>diceToken: (in category 'die rolling') ----- diceToken: stream "Private. Mini scanner, see #roll:" stream atEnd ifTrue: [^ nil]. + stream peek isDigit ifTrue: [^ Integer readFrom: stream]. - stream peek isDigit ifTrue: [^ Number readFrom: stream]. ^ stream next asLowercase! Item was changed: ----- Method: Random>>roll: (in category 'die rolling') ----- roll: diceString "Roll some dice, DnD-style, according to this mini-grammar: + dice := epxr {pm dice} - dice := epxr {pm expr} pm := '+' | '-' expr := num | num dD | dD numP | num dD numP dD := 'd' | 'D' num := digit+ numP := num | '%'" | stream op result | stream := diceString readStream. result := 0. op := #+. [ | res range dice token | token := self diceToken: stream. token isNumber ifTrue: [dice := token. + res := token. token := self diceToken: stream] ifFalse: [token == $d ifTrue: [dice := 1] + ifFalse: [self error: 'unknown token' , token]]. - ifFalse: [res := 0]]. token == $d ifTrue: [token := self diceToken: stream. token isNumber ifTrue: [range := token. token := self diceToken: stream] ifFalse: [token == $% ifTrue: [range := 100. token := self diceToken: stream] ifFalse: [range := 6]]. res := 0. dice timesRepeat: [res := res + (self nextInt: range)]]. result := result perform: op with: res. token ifNil: [^ result]. (token == $+ or: [token == $-]) ifFalse: [self error: 'unknown token ' , token]. op := token asSymbol] repeat!

1 0

The Trunk: KernelTests-cmfcmf.357.mcz
by commits＠source.squeak.org 31 May '19

31 May '19

Marcel Taeumel uploaded a new version of KernelTests to project The Trunk: http://source.squeak.org/trunk/KernelTests-cmfcmf.357.mcz ==================== Summary ==================== Name: KernelTests-cmfcmf.357 Author: cmfcmf Time: 29 May 2019, 10:11:48.378802 pm UUID: f67037ad-f5fe-4145-8efa-3845d0494ace Ancestors: KernelTests-fn.356 Test Random>>roll: =============== Diff against KernelTests-fn.356 =============== Item was added: + ----- Method: RandomTest>>testRoll (in category 'tests') ----- + testRoll + + | random result | + random := Random seed: 14482. + + "Roll the default die (d6)" + 100 timesRepeat: [ + result := random roll: 'd'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 6 description: [ 'Rolled value ', result asString, ' should be 6 or less.' ] ]. + 100 timesRepeat: [ + result := random roll: '1d'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 6 description: [ 'Rolled value ', result asString, ' should be 6 or less.' ] ]. + + "Roll a d20" + 100 timesRepeat: [ + result := random roll: '1d20'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 20 description: [ 'Rolled value ', result asString, ' should be 20 or less.' ] ]. + + "Roll a d% (d100)" + 1000 timesRepeat: [ + result := random roll: '1d%'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 100 description: [ 'Rolled value ', result asString, ' should be 100 or less.' ] ]. + 1000 timesRepeat: [ + result := random roll: 'd%'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 100 description: [ 'Rolled value ', result asString, ' should be 100 or less.' ] ]. + + "Roll multiple dice" + 100 timesRepeat: [ + result := random roll: '2d2'. + self assert: result >= 2 description: [ 'Rolled value ', result asString, ' should be 2 or more.' ]. + self assert: result <= 4 description: [ 'Rolled value ', result asString, ' should be 4 or less.' ] ]. + 100 timesRepeat: [ + result := random roll: '1d2+1d2'. + self assert: result >= 2 description: [ 'Rolled value ', result asString, ' should be 2 or more.' ]. + self assert: result <= 4 description: [ 'Rolled value ', result asString, ' should be 4 or less.' ] ]. + + "Roll some d1s" + result := random roll: '10d1'. + self assert: result = 10 description: [ 'Rolled value ', result asString, 'should be 10.' ]. + result := random roll: '10d1-5d1'. + self assert: result = 5 description: [ 'Rolled value ', result asString, 'should be 5.' ]. + + "Roll a constant value" + result := random roll: '5'. + self assert: result = 5 description: [ 'Rolled value ', result asString, 'should be 5.' ]. + result := random roll: '5+3+2'. + self assert: result = 10 description: [ 'Rolled value ', result asString, 'should be 10.' ]. + + "Roll die and add constant value" + result := random roll: '1d1+3'. + self assert: result = 4 description: [ 'Rolled value ', result asString, 'should be 4.' ].!

1 0

The Trunk: Kernel-cmfcmf.1216.mcz
by commits＠source.squeak.org 31 May '19

31 May '19

Marcel Taeumel uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-cmfcmf.1216.mcz ==================== Summary ==================== Name: Kernel-cmfcmf.1216 Author: cmfcmf Time: 29 May 2019, 10:09:51.240802 pm UUID: 3c20ffc1-89f8-474e-95a7-05fab06c9f9b Ancestors: Kernel-eem.1215 Make Random>>roll: work again and add support for constant operands This version fixes three issues: 1. Random>>roll: was not working anymore. The following code only produced an error: Random new roll: '1d20' This happened due to an issue with Random>>diceToken: which used Number>>readFrom: to extract numbers from the string. Calling Number readFrom: '1d20' results in 100000000000000000000 instead of the expected 1, because $d is seen as an exponent letter by the ExtendedNumberParser used by Number>>readFrom: (see ExtendedNumberParser>>exponentLetters). I therefore replaced Number>>readFrom: by Integer>>readFrom:, which doesn't use the exponent letters. 2. I also fixed a minor issue with the mini-grammar's 'dice' rule. Before this version, it read as if it only supported one or two operands, when it really supported an unlimited number of operands. 3. The mini-grammer's 'expr' rule read as if it supported constant operands (e.g., '1d20+5' or '42'), because 'expr' was allowed to be just 'num'. As far as I can gather, this has never worked (but I might be wrong). This is now also fixed by always setting res to the token read if the token is a number. If the token is neither a number nor $d, an error is now signalled. =============== Diff against Kernel-eem.1215 =============== Item was changed: ----- Method: Random>>diceToken: (in category 'die rolling') ----- diceToken: stream "Private. Mini scanner, see #roll:" stream atEnd ifTrue: [^ nil]. + stream peek isDigit ifTrue: [^ Integer readFrom: stream]. - stream peek isDigit ifTrue: [^ Number readFrom: stream]. ^ stream next asLowercase! Item was changed: ----- Method: Random>>roll: (in category 'die rolling') ----- roll: diceString "Roll some dice, DnD-style, according to this mini-grammar: + dice := epxr {pm dice} - dice := epxr {pm expr} pm := '+' | '-' expr := num | num dD | dD numP | num dD numP dD := 'd' | 'D' num := digit+ numP := num | '%'" | stream op result | stream := diceString readStream. result := 0. op := #+. [ | res range dice token | token := self diceToken: stream. token isNumber ifTrue: [dice := token. + res := token. token := self diceToken: stream] ifFalse: [token == $d ifTrue: [dice := 1] + ifFalse: [self error: 'unknown token' , token]]. - ifFalse: [res := 0]]. token == $d ifTrue: [token := self diceToken: stream. token isNumber ifTrue: [range := token. token := self diceToken: stream] ifFalse: [token == $% ifTrue: [range := 100. token := self diceToken: stream] ifFalse: [range := 6]]. res := 0. dice timesRepeat: [res := res + (self nextInt: range)]]. result := result perform: op with: res. token ifNil: [^ result]. (token == $+ or: [token == $-]) ifFalse: [self error: 'unknown token ' , token]. op := token asSymbol] repeat!

1 0

The Inbox: SUnit-cmm.116.mcz
by commits＠source.squeak.org 31 May '19

31 May '19

Chris Muller uploaded a new version of SUnit to project The Inbox: http://source.squeak.org/inbox/SUnit-cmm.116.mcz ==================== Summary ==================== Name: SUnit-cmm.116 Author: cmm Time: 23 May 2019, 9:39:05.797827 pm UUID: ecce7092-6268-42a0-87d1-cbdea912ea68 Ancestors: SUnit-pre.115 The Result of a Test which is tagged as an #expectedFailure IS a failure if the test passed. Likewise, when a should: of a test which is ragged as an expectedFailure fails, the TestResult itself is considered passed, not failed. This fixes the SUnit browser to display these TestResults accordingly, to not falsely include these "failed" Results in list because they were already expected to. =============== Diff against SUnit-pre.115 =============== Item was changed: ----- Method: TestCase>>assert: (in category 'accessing') ----- assert: aBooleanOrBlock + aBooleanOrBlock value = self shouldPass ifFalse: [self signalFailure: 'Assertion failed'] - aBooleanOrBlock value ifFalse: [self signalFailure: 'Assertion failed'] ! Item was changed: ----- Method: TestResult>>unexpectedPasses (in category 'accessing') ----- unexpectedPasses + ^ failures select: [:each | each shouldPass not] ! - ^ passed select: [:each | each shouldPass not] !

7 16

valid characters for binary selector
by Chris Muller 30 May '19

30 May '19

I was looking for every valid character allowed as part of a binary selector name. Nothing in SelectorNode was obvious to me, but the AST diagram in my copy of *Smalltalk-80, The Language and Implementation*, says they are: - + / * ~ < > = @ % | & ? ! Is this still correct?

6 7

Re: [squeak-dev] Proposal: Morphs in Text
by Chris Muller 30 May '19

30 May '19

Hi Patrick, It breaks something with layout of non-ascii characters. Try selecting a binary file in the FileBrowser. Warning: save your image first. - Chris On Tue, May 28, 2019 at 11:27 AM <patrick.rein(a)hpi.uni-potsdam.de> wrote: > > Hi everyone, > > please find attached a change set which includes: > 1.) Some fixes to the Scanner infrastructure to support Morphs in Text better > 2.) Improvements to describe how a Morph should be aligned with regard to the text. Relevant methods on Morph are: > #textAnchorVerticalAlignment: > #textAnchorPadding: > #textAnchorConsumesHorizontalSpace: > > You can see an example by executing the body of the test: > TextAnchorTest>>#testHavingAnAnchorCanBeAlignedDifferently > > !Warning: As this touches Scanner code a lot, loading this change set might make your image unresponsive! > > I would like to point out that the test cases are preliminary and a few of the methods still require polishing. Nevertheless, I would like to ask for comments on the change set, in particular regarding: > 1.) Should the alignment information be stored in the Morph or the TextAnchorAttribute? Currently the information is stored in the Morph which parallels LayoutProperties. > 2.) Is using caseOf: in Scanner code fine? I suspect it to be quite expensive which is probably not a good thing in Scanners? > 3.) Should the cursor allow users to navigate (or select?) the "start of header" character that is used to denote the text anchor placement? > 4.) Does anyone remember / know what the textAnchorType was intended for? The previous implementation largely ignored it and this one does so too. > > Thanks and best wishes, > Patrick

1 0

The Inbox: KernelTests-cmfcmf.357.mcz
by commits＠source.squeak.org 29 May '19

29 May '19

A new version of KernelTests was added to project The Inbox: http://source.squeak.org/inbox/KernelTests-cmfcmf.357.mcz ==================== Summary ==================== Name: KernelTests-cmfcmf.357 Author: cmfcmf Time: 29 May 2019, 10:11:48.378802 pm UUID: f67037ad-f5fe-4145-8efa-3845d0494ace Ancestors: KernelTests-fn.356 Test Random>>roll: =============== Diff against KernelTests-fn.356 =============== Item was added: + ----- Method: RandomTest>>testRoll (in category 'tests') ----- + testRoll + + | random result | + random := Random seed: 14482. + + "Roll the default die (d6)" + 100 timesRepeat: [ + result := random roll: 'd'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 6 description: [ 'Rolled value ', result asString, ' should be 6 or less.' ] ]. + 100 timesRepeat: [ + result := random roll: '1d'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 6 description: [ 'Rolled value ', result asString, ' should be 6 or less.' ] ]. + + "Roll a d20" + 100 timesRepeat: [ + result := random roll: '1d20'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 20 description: [ 'Rolled value ', result asString, ' should be 20 or less.' ] ]. + + "Roll a d% (d100)" + 1000 timesRepeat: [ + result := random roll: '1d%'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 100 description: [ 'Rolled value ', result asString, ' should be 100 or less.' ] ]. + 1000 timesRepeat: [ + result := random roll: 'd%'. + self assert: result >= 1 description: [ 'Rolled value ', result asString, ' should be 1 or more.' ]. + self assert: result <= 100 description: [ 'Rolled value ', result asString, ' should be 100 or less.' ] ]. + + "Roll multiple dice" + 100 timesRepeat: [ + result := random roll: '2d2'. + self assert: result >= 2 description: [ 'Rolled value ', result asString, ' should be 2 or more.' ]. + self assert: result <= 4 description: [ 'Rolled value ', result asString, ' should be 4 or less.' ] ]. + 100 timesRepeat: [ + result := random roll: '1d2+1d2'. + self assert: result >= 2 description: [ 'Rolled value ', result asString, ' should be 2 or more.' ]. + self assert: result <= 4 description: [ 'Rolled value ', result asString, ' should be 4 or less.' ] ]. + + "Roll some d1s" + result := random roll: '10d1'. + self assert: result = 10 description: [ 'Rolled value ', result asString, 'should be 10.' ]. + result := random roll: '10d1-5d1'. + self assert: result = 5 description: [ 'Rolled value ', result asString, 'should be 5.' ]. + + "Roll a constant value" + result := random roll: '5'. + self assert: result = 5 description: [ 'Rolled value ', result asString, 'should be 5.' ]. + result := random roll: '5+3+2'. + self assert: result = 10 description: [ 'Rolled value ', result asString, 'should be 10.' ]. + + "Roll die and add constant value" + result := random roll: '1d1+3'. + self assert: result = 4 description: [ 'Rolled value ', result asString, 'should be 4.' ].!

1 0

The Inbox: Kernel-cmfcmf.1216.mcz
by commits＠source.squeak.org 29 May '19

29 May '19

A new version of Kernel was added to project The Inbox: http://source.squeak.org/inbox/Kernel-cmfcmf.1216.mcz ==================== Summary ==================== Name: Kernel-cmfcmf.1216 Author: cmfcmf Time: 29 May 2019, 10:09:51.240802 pm UUID: 3c20ffc1-89f8-474e-95a7-05fab06c9f9b Ancestors: Kernel-eem.1215 Make Random>>roll: work again and add support for constant operands This version fixes three issues: 1. Random>>roll: was not working anymore. The following code only produced an error: Random new roll: '1d20' This happened due to an issue with Random>>diceToken: which used Number>>readFrom: to extract numbers from the string. Calling Number readFrom: '1d20' results in 100000000000000000000 instead of the expected 1, because $d is seen as an exponent letter by the ExtendedNumberParser used by Number>>readFrom: (see ExtendedNumberParser>>exponentLetters). I therefore replaced Number>>readFrom: by Integer>>readFrom:, which doesn't use the exponent letters. 2. I also fixed a minor issue with the mini-grammar's 'dice' rule. Before this version, it read as if it only supported one or two operands, when it really supported an unlimited number of operands. 3. The mini-grammer's 'expr' rule read as if it supported constant operands (e.g., '1d20+5' or '42'), because 'expr' was allowed to be just 'num'. As far as I can gather, this has never worked (but I might be wrong). This is now also fixed by always setting res to the token read if the token is a number. If the token is neither a number nor $d, an error is now signalled. =============== Diff against Kernel-eem.1215 =============== Item was changed: ----- Method: Random>>diceToken: (in category 'die rolling') ----- diceToken: stream "Private. Mini scanner, see #roll:" stream atEnd ifTrue: [^ nil]. + stream peek isDigit ifTrue: [^ Integer readFrom: stream]. - stream peek isDigit ifTrue: [^ Number readFrom: stream]. ^ stream next asLowercase! Item was changed: ----- Method: Random>>roll: (in category 'die rolling') ----- roll: diceString "Roll some dice, DnD-style, according to this mini-grammar: + dice := epxr {pm dice} - dice := epxr {pm expr} pm := '+' | '-' expr := num | num dD | dD numP | num dD numP dD := 'd' | 'D' num := digit+ numP := num | '%'" | stream op result | stream := diceString readStream. result := 0. op := #+. [ | res range dice token | token := self diceToken: stream. token isNumber ifTrue: [dice := token. + res := token. token := self diceToken: stream] ifFalse: [token == $d ifTrue: [dice := 1] + ifFalse: [self error: 'unknown token' , token]]. - ifFalse: [res := 0]]. token == $d ifTrue: [token := self diceToken: stream. token isNumber ifTrue: [range := token. token := self diceToken: stream] ifFalse: [token == $% ifTrue: [range := 100. token := self diceToken: stream] ifFalse: [range := 6]]. res := 0. dice timesRepeat: [res := res + (self nextInt: range)]]. result := result perform: op with: res. token ifNil: [^ result]. (token == $+ or: [token == $-]) ifFalse: [self error: 'unknown token ' , token]. op := token asSymbol] repeat!

1 0

The Inbox: Graphics-cmfcmf.407.mcz
by commits＠source.squeak.org 29 May '19

29 May '19

A new version of Graphics was added to project The Inbox: http://source.squeak.org/inbox/Graphics-cmfcmf.407.mcz ==================== Summary ==================== Name: Graphics-cmfcmf.407 Author: cmfcmf Time: 28 May 2019, 11:08:38.38585 am UUID: 02f1c0df-d0cd-4c46-a8bc-c2cd77ab3ed3 Ancestors: Graphics-mt.406 Send correct message when primitive fails (>>primitiveFailed instead of >>primitiveFail) I found no other occurrences of >>primitiveFail in the image. =============== Diff against Graphics-mt.406 =============== Item was changed: ----- Method: Bitmap>>decompress:fromByteArray:at: (in category 'filing') ----- decompress: bm fromByteArray: ba at: index "Decompress the body of a byteArray encoded by compressToByteArray (qv)... The format is simply a sequence of run-coded pairs, {N D}*. N is a run-length * 4 + data code. D, the data, depends on the data code... 0 skip N words, D is absent (could be used to skip from one raster line to the next) 1 N words with all 4 bytes = D (1 byte) 2 N words all = D (4 bytes) 3 N words follow in D (4N bytes) S and N are encoded as follows (see decodeIntFrom:)... 0-223 0-223 224-254 (0-30)*256 + next byte (0-7935) 255 next 4 bytes" "NOTE: If fed with garbage, this routine could read past the end of ba, but it should fail before writing past the ned of bm." | i code n anInt data end k pastEnd | <primitive: 'primitiveDecompressFromByteArray' module: 'MiscPrimitivePlugin'> <var: #bm type: 'int *'> <var: #ba type: 'unsigned char *'> <var: #anInt type: 'unsigned int'> "Force the type, otherwise it is inferred as unsigned char because assigned from ba" <var: #data type: 'unsigned int'> i := index. "byteArray read index" end := ba size. k := 1. "bitmap write index" pastEnd := bm size + 1. [i <= end] whileTrue: ["Decode next run start N" anInt := ba at: i. i := i+1. anInt <= 223 ifFalse: [anInt <= 254 ifTrue: [anInt := (anInt-224)*256 + (ba at: i). i := i+1] ifFalse: [anInt := 0. 1 to: 4 do: [:j | anInt := (anInt bitShift: 8) + (ba at: i). i := i+1]]]. n := anInt >> 2. + (k + n) > pastEnd ifTrue: [^ self primitiveFailed]. - (k + n) > pastEnd ifTrue: [^ self primitiveFail]. code := anInt bitAnd: 3. code = 0 ifTrue: ["skip"]. code = 1 ifTrue: ["n consecutive words of 4 bytes = the following byte" data := ba at: i. i := i+1. data := data bitOr: (data bitShift: 8). data := data bitOr: (data bitShift: 16). 1 to: n do: [:j | bm at: k put: data. k := k+1]]. code = 2 ifTrue: ["n consecutive words = 4 following bytes" data := 0. 1 to: 4 do: [:j | data := (data bitShift: 8) bitOr: (ba at: i). i := i+1]. 1 to: n do: [:j | bm at: k put: data. k := k+1]]. code = 3 ifTrue: ["n consecutive words from the data..." 1 to: n do: [:m | data := 0. 1 to: 4 do: [:j | data := (data bitShift: 8) bitOr: (ba at: i). i := i+1]. bm at: k put: data. k := k+1]]]!

3 2

Re: [squeak-dev] Proposal: Morphs in Text
by K K Subbu 29 May '19

29 May '19

Thank you, Patrick, for your initiatives. TextMorph really needs some attention. On 28/05/19 9:48 PM, patrick.rein(a)hpi.uni-potsdam.de wrote: > 1.) Should the alignment information be stored in the Morph or the > TextAnchorAttribute? Currently the information is stored in the Morph > which parallels LayoutProperties. John Maloney's seminal paper on Morphic presented Morph as a graphical unit for direct interaction (event handling) and liveness (stepping). It was silent on modeling relations between morphs (with some exceptions). Alignment and anchoring are properties of relationship between two morphs rather than an intrinsic property of a Morph. I feel they should be handled by subclasses (isA) or objects (hasA). Morph is already pretty large for a basic unit. > 4.) Does anyone remember / know what the textAnchorType was intended > for? The previous implementation largely ignored it and this one does > so too. I think it was intended to stick a morph to a position within its container (#document) or flow with other text morphs as paragraphs (#paragraph) or character spans (#inline). Regards .. Subbu

1 0

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page: