Squeak-dev December 2017

squeak-dev@lists.squeakfoundation.org

34 participants
159 discussions

The Trunk: Collections-nice.777.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.777.mcz ==================== Summary ==================== Name: Collections-nice.777 Author: nice Time: 1 December 2017, 9:37:36.392066 am UUID: 4e267cfa-394e-4767-bcac-9c6937b8ed09 Ancestors: Collections-nice.776 Clean up leftovers in CharacterSet and SortFunction =============== Diff against Collections-nice.776 =============== Item was removed: - ----- Method: CharacterSet>>size (in category 'accessing') ----- - size - - ^tally! Item was removed: - ----- Method: DefaultSortFunction class>>new (in category 'instance creation') ----- - new - ^UniqueInstance ifNil: [self basicNew initialize]! Item was removed: - ----- Method: ReverseSortFunction>>toggleDirection (in category 'converting') ----- - toggleDirection - ^collator!

1 0

Two CompiledMethod classes in the hierarchy just for me or for everyone
by Nicolas Cellier 01 Dec '17

01 Dec '17

Can you see this too when doing ByteArray browseHierarchy?

2 4

The Trunk: Kernel-nice.1128.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1128.mcz ==================== Summary ==================== Name: Kernel-nice.1128 Author: nice Time: 1 December 2017, 9:12:13.199745 am UUID: 0688f4f5-7825-45aa-9e8e-e891d4c4feb4 Ancestors: Kernel-nice.1127 Fix CompiledMethod appearing twice in ByteArray hierarchy =============== Diff against Kernel-nice.1127 =============== Item was changed: + (PackageInfo named: 'Kernel') postscript: '((ByteArray subclasses includes: CompiledMethod) and: [CompiledMethod superclass ~= ByteArray]) ifTrue [ByteArray removeSubclass: CompiledMethod]'! - (PackageInfo named: 'Kernel') postscript: '"below, add code to be run after the loading of this package" - (Smalltalk globals includesKey: #MethodContext) ifTrue: - [Undeclared declare: #MethodContext from: Smalltalk globals]'!

1 0

The Trunk: MorphicExtras-nice.218.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

Nicolas Cellier uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-nice.218.mcz ==================== Summary ==================== Name: MorphicExtras-nice.218 Author: nice Time: 26 November 2017, 11:17:28.596315 pm UUID: c781b24f-85b2-4fca-941a-dd8c2852a640 Ancestors: MorphicExtras-dtl.217 Change fancy categorization of FancyMailComposition methods. My arbitrary categorization might be less than perfect, but at least this makes testNoSpecialCategories pass. =============== Diff against MorphicExtras-dtl.217 =============== Item was changed: + ----- Method: FancyMailComposition>>addAttachment (in category 'actions') ----- - ----- Method: FancyMailComposition>>addAttachment (in category '-- all --') ----- addAttachment | file fileResult fileName | textEditor ifNotNil: [self hasUnacceptedEdits ifTrue: [textEditor accept]]. (fileResult := StandardFileMenu oldFile) ifNotNil: [fileName := fileResult directory fullNameFor: fileResult name. file := FileStream readOnlyFileNamed: fileName. file ifNotNil: [file binary. self messageText: ((MailMessage from: self messageText asString) addAttachmentFrom: file withName: fileResult name; text). file close]] ! Item was changed: + ----- Method: FancyMailComposition>>breakLines:atWidth: (in category 'private') ----- - ----- Method: FancyMailComposition>>breakLines:atWidth: (in category '-- all --') ----- breakLines: aString atWidth: width "break lines in the given string into shorter lines" | result atAttachment | result := WriteStream on: (String new: (aString size * 50 // 49)). atAttachment := false. aString asString linesDo: [ :line | | start end | (line beginsWith: '====') ifTrue: [ atAttachment := true ]. atAttachment ifTrue: [ "at or after an attachment line; no more wrapping for the rest of the message" result nextPutAll: line. result cr ] ifFalse: [ (line beginsWith: '>') ifTrue: [ "it's quoted text; don't wrap it" result nextPutAll: line. result cr. ] ifFalse: [ "regular old line. Wrap it to multiple lines" start := 1. "output one shorter line each time through this loop" [ start + width <= line size ] whileTrue: [ "find the end of the line" end := start + width - 1. [end >= start and: [ (line at: (end+1)) isSeparator not ]] whileTrue: [ end := end - 1 ]. end < start ifTrue: [ "a word spans the entire width!!" end := start + width - 1 ]. "copy the line to the output" result nextPutAll: (line copyFrom: start to: end). result cr. "get ready for next iteration" start := end+1. (line at: start) isSeparator ifTrue: [ start := start + 1 ]. ]. "write out the final part of the line" result nextPutAll: (line copyFrom: start to: line size). result cr. ]. ]. ]. ^result contents! Item was changed: + ----- Method: FancyMailComposition>>breakLinesInMessage: (in category 'private') ----- - ----- Method: FancyMailComposition>>breakLinesInMessage: (in category '-- all --') ----- breakLinesInMessage: message "reformat long lines in the specified message into shorter ones" self flag: #TODO. "Maybe deprecated" message body mainType = 'text' ifTrue: [ "it's a single-part text message. reformat the text" | newBodyText | newBodyText := self breakLines: message bodyText atWidth: 72. message body: (MIMEDocument contentType: message body contentType content: newBodyText). ^self ]. message body isMultipart ifTrue: [ "multipart message; process the top-level parts. HACK: the parts are modified in place" message parts do: [ :part | part body mainType = 'text' ifTrue: [ | newBodyText | newBodyText := self breakLines: part bodyText atWidth: 72. part body: (MIMEDocument contentType: part body contentType content: newBodyText) ] ]. message regenerateBodyFromParts. ].! Item was changed: + ----- Method: FancyMailComposition>>menuGet:shifted: (in category 'interface') ----- - ----- Method: FancyMailComposition>>menuGet:shifted: (in category '-- all --') ----- menuGet: aMenu shifted: shifted aMenu addList: { {'find...(f)' translated. #find}. {'find selection again (g)' translated. #findAgain}. #-. {'accept (s)' translated. #accept}. {'send message' translated. #submit}}. ^aMenu.! Item was changed: + ----- Method: FancyMailComposition>>messageText (in category 'accessing') ----- - ----- Method: FancyMailComposition>>messageText (in category '-- all --') ----- messageText "return the current text" ^messageText. ! Item was changed: + ----- Method: FancyMailComposition>>messageText: (in category 'accessing') ----- - ----- Method: FancyMailComposition>>messageText: (in category '-- all --') ----- messageText: aText "change the current text" messageText := aText. self changed: #messageText. ^true! Item was changed: + ----- Method: FancyMailComposition>>morphicOpen (in category 'user interface') ----- - ----- Method: FancyMailComposition>>morphicOpen (in category '-- all --') ----- morphicOpen "open an interface for sending a mail message with the given initial text " | textMorph buttonsList sendButton attachmentButton | morphicWindow := SystemWindow labelled: 'Mister Postman'. morphicWindow model: self. textEditor := textMorph := PluggableTextMorph on: self text: #messageText accept: #messageText: readSelection: nil menu: #menuGet:shifted:. morphicWindow addMorph: textMorph frame: (0 @ 0.1 corner: 1 @ 1). buttonsList := AlignmentMorph newRow. sendButton := PluggableButtonMorph on: self getState: nil action: #submit. sendButton hResizing: #spaceFill; vResizing: #spaceFill; label: 'send message'; setBalloonText: 'Accept any unaccepted edits and add this to the queue of messages to be sent'; onColor: Color white offColor: Color white. buttonsList addMorphBack: sendButton. attachmentButton := PluggableButtonMorph on: self getState: nil action: #addAttachment. attachmentButton hResizing: #spaceFill; vResizing: #spaceFill; label: 'add attachment'; setBalloonText: 'Send a file with the message'; onColor: Color white offColor: Color white. buttonsList addMorphBack: attachmentButton. morphicWindow addMorph: buttonsList frame: (0 @ 0 extent: 1 @ 0.1). morphicWindow openInWorld! Item was changed: + ----- Method: FancyMailComposition>>mvcOpen (in category 'user interface') ----- - ----- Method: FancyMailComposition>>mvcOpen (in category '-- all --') ----- mvcOpen | textView sendButton | mvcWindow := StandardSystemView new label: 'Mister Postman'; minimumSize: 400@250; model: self. textView := PluggableTextView on: self text: #messageText accept: #messageText:. textEditor := textView controller. sendButton := PluggableButtonView on: self getState: nil action: #submit. sendButton label: 'Send'. sendButton borderWidth: 1. sendButton window: (1@1 extent: 398@38). mvcWindow addSubView: sendButton. textView window: (0@40 corner: 400@250). mvcWindow addSubView: textView below: sendButton. mvcWindow controller open. ! Item was changed: + ----- Method: FancyMailComposition>>open (in category 'user interface') ----- - ----- Method: FancyMailComposition>>open (in category '-- all --') ----- open "open an interface" ^ Project current dispatchTo: self addPrefixAndSend: #Open withArguments: {} ! Item was changed: + ----- Method: FancyMailComposition>>perform:orSendTo: (in category 'private') ----- - ----- Method: FancyMailComposition>>perform:orSendTo: (in category '-- all --') ----- perform: selector orSendTo: otherTarget (self respondsTo: selector) ifTrue: [^self perform: selector] ifFalse: [^otherTarget perform: selector] ! Item was changed: + ----- Method: FancyMailComposition>>sendMailMessage: (in category 'MailSender interface') ----- - ----- Method: FancyMailComposition>>sendMailMessage: (in category '-- all --') ----- sendMailMessage: aMailMessage self messageText: aMailMessage text! Item was changed: + ----- Method: FancyMailComposition>>smtpServer (in category 'MailSender interface') ----- - ----- Method: FancyMailComposition>>smtpServer (in category '-- all --') ----- smtpServer ^MailSender smtpServer! Item was changed: + ----- Method: FancyMailComposition>>subject (in category 'accessing') ----- - ----- Method: FancyMailComposition>>subject (in category 'access') ----- subject ^ subject ! Item was changed: + ----- Method: FancyMailComposition>>subject: (in category 'accessing') ----- - ----- Method: FancyMailComposition>>subject: (in category 'access') ----- subject: x subject := x. self changed: #subject. ^true! Item was changed: + ----- Method: FancyMailComposition>>to (in category 'accessing') ----- - ----- Method: FancyMailComposition>>to (in category 'access') ----- to ^to! Item was changed: + ----- Method: FancyMailComposition>>to: (in category 'accessing') ----- - ----- Method: FancyMailComposition>>to: (in category 'access') ----- to: x to := x. self changed: #to. ^true !

3 3

The Trunk: Collections-nice.775.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.775.mcz ==================== Summary ==================== Name: Collections-nice.775 Author: nice Time: 1 December 2017, 1:25:19.882602 am UUID: 5ef7a80c-6213-4e8e-8f0c-b45e110ce15e Ancestors: Collections-nice.774 Rename CharacterSet -> ByteCharacterSet This is step 1: - create a parallel ByteCharacterSet - then mutate CharacterSet instances -> ByteCharacterSet in postscript =============== Diff against Collections-nice.774 =============== Item was added: + ----- Method: AbstractCharacterSet>>species (in category 'private') ----- + species + ^CharacterSet! Item was added: + Collection subclass: #ByteCharacterSet + instanceVariableNames: 'byteArrayMap tally' + classVariableNames: 'CrLf NonSeparators Separators' + poolDictionaries: '' + category: 'Collections-Support'! + + !ByteCharacterSet commentStamp: '<historical>' prior: 0! + A set of characters. Lookups for inclusion are very fast.! Item was added: + ----- Method: ByteCharacterSet class>>allCharacters (in category 'instance creation') ----- + allCharacters + "return a set containing all characters" + + | set | + set := self empty. + 0 to: 255 do: [ :ascii | set add: (Character value: ascii) ]. + ^set! Item was added: + ----- Method: ByteCharacterSet class>>cleanUp: (in category 'initialize-release') ----- + cleanUp: aggressive + + CrLf := NonSeparators := Separators := nil! Item was added: + ----- Method: ByteCharacterSet class>>crlf (in category 'accessing') ----- + crlf + + ^CrLf ifNil: [ CrLf := self with: Character cr with: Character lf ]! Item was added: + ----- Method: ByteCharacterSet class>>empty (in category 'instance creation') ----- + empty + "return an empty set of characters" + ^self new! Item was added: + ----- Method: ByteCharacterSet class>>newFrom: (in category 'instance creation') ----- + newFrom: aCollection + | newCollection | + newCollection := self new. + newCollection addAll: aCollection. + ^newCollection! Item was added: + ----- Method: ByteCharacterSet class>>nonSeparators (in category 'accessing') ----- + nonSeparators + "return a set containing everything but the whitespace characters" + + ^NonSeparators ifNil: [ + NonSeparators := self separators complement ]! Item was added: + ----- Method: ByteCharacterSet class>>separators (in category 'accessing') ----- + separators + "return a set containing just the whitespace characters" + + ^Separators ifNil: [ Separators := self newFrom: Character separators ]! Item was added: + ----- Method: ByteCharacterSet class>>withAll: (in category 'instance creation') ----- + withAll: aCollection + "Create a new ByteCharacterSet containing all the characters from aCollection." + + ^self newFrom: aCollection! Item was added: + ----- Method: ByteCharacterSet>>= (in category 'comparing') ----- + = anObject + + self species == anObject species ifFalse: [ ^false ]. + anObject size = tally ifFalse: [ ^false ]. + ^self byteArrayMap = anObject byteArrayMap! Item was added: + ----- Method: ByteCharacterSet>>add: (in category 'adding') ----- + add: aCharacter + "I automatically become a WideByteCharacterSet if you add a wide character to myself" + + | index | + (index := aCharacter asInteger + 1) <= 256 ifFalse: [ + | wide | + wide := WideCharacterSet new. + wide addAll: self. + wide add: aCharacter. + self becomeForward: wide. + ^aCharacter ]. + (byteArrayMap at: index) = 1 ifFalse: [ + byteArrayMap at: index put: 1. + tally := tally + 1 ]. + ^aCharacter! Item was added: + ----- Method: ByteCharacterSet>>asString (in category 'conversion') ----- + asString + "Convert the receiver into a String" + + ^String new: self size streamContents:[:s| + self do:[:ch| s nextPut: ch]. + ].! Item was added: + ----- Method: ByteCharacterSet>>byteArrayMap (in category 'private') ----- + byteArrayMap + "return a ByteArray mapping each ascii value to a 1 if that ascii value is in the set, and a 0 if it isn't. Intended for use by primitives only" + ^byteArrayMap! Item was added: + ----- Method: ByteCharacterSet>>byteComplement (in category 'conversion') ----- + byteComplement + "return a character set containing precisely the single byte characters the receiver does not" + + | set | + set := ByteCharacterSet allCharacters. + self do: [ :c | set remove: c ]. + ^set! Item was added: + ----- Method: ByteCharacterSet>>complement (in category 'conversion') ----- + complement + "return a character set containing precisely the characters the receiver does not" + + ^ByteCharacterSetComplement of: self copy! Item was added: + ----- Method: ByteCharacterSet>>do: (in category 'enumerating') ----- + do: aBlock + "evaluate aBlock with each character in the set" + + | index | + tally >= 128 ifTrue: [ "dense" + index := 0. + [ (index := index + 1) <= 256 ] whileTrue: [ + (byteArrayMap at: index) = 1 ifTrue: [ + aBlock value: (Character value: index - 1) ] ]. + ^self ]. + "sparse" + index := 0. + [ (index := byteArrayMap indexOf: 1 startingAt: index + 1) = 0 ] whileFalse: [ + aBlock value: (Character value: index - 1) ]. + ! Item was added: + ----- Method: ByteCharacterSet>>findFirstInByteString:startingAt: (in category 'zap me later') ----- + findFirstInByteString: aByteString startingAt: startIndex + "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." + ^ByteString + findFirstInString: aByteString + inSet: self byteArrayMap + startingAt: startIndex! Item was added: + ----- Method: ByteCharacterSet>>hasWideCharacters (in category 'testing') ----- + hasWideCharacters + ^false! Item was added: + ----- Method: ByteCharacterSet>>hash (in category 'comparing') ----- + hash + ^self byteArrayMap hash! Item was added: + ----- Method: ByteCharacterSet>>includes: (in category 'testing') ----- + includes: anObject + + | index | + anObject isCharacter ifFalse: [ ^false ]. + (index := anObject asInteger + 1) > 256 ifTrue: [ ^false ]. + ^(byteArrayMap at: index) > 0! Item was added: + ----- Method: ByteCharacterSet>>initialize (in category 'private') ----- + initialize + + byteArrayMap := ByteArray new: 256. + tally := 0! Item was added: + ----- Method: ByteCharacterSet>>isEmpty (in category 'testing') ----- + isEmpty + ^tally = 0! Item was added: + ----- Method: ByteCharacterSet>>occurrencesOf: (in category 'zap me later') ----- + occurrencesOf: anObject + "Answer how many of the receiver's elements are equal to anObject. Optimized version." + + (self includes: anObject) ifTrue: [ ^1 ]. + ^0! Item was added: + ----- Method: ByteCharacterSet>>postCopy (in category 'copying') ----- + postCopy + super postCopy. + byteArrayMap := byteArrayMap copy! Item was added: + ----- Method: ByteCharacterSet>>remove: (in category 'removing') ----- + remove: aCharacter + + ^self remove: aCharacter ifAbsent: aCharacter! Item was added: + ----- Method: ByteCharacterSet>>remove:ifAbsent: (in category 'removing') ----- + remove: aCharacter ifAbsent: aBlock + + | index | + (index := aCharacter asciiValue + 1) <= 256 ifFalse: [ ^aBlock value ]. + (byteArrayMap at: index) = 0 ifTrue: [ ^aBlock value ]. + byteArrayMap at: index put: 0. + tally := tally - 1. + ^aCharacter! Item was added: + ----- Method: ByteCharacterSet>>removeAll (in category 'removing') ----- + removeAll + + byteArrayMap atAllPut: 0. + tally := 0! Item was added: + ----- Method: ByteCharacterSet>>size (in category 'accessing') ----- + size + + ^tally! Item was added: + ----- Method: ByteCharacterSet>>species (in category 'zap me later') ----- + species + ^CharacterSet! Item was added: + ----- Method: ByteCharacterSet>>union: (in category 'enumerating') ----- + union: aCollection + (self species = aCollection species or: [aCollection isString or: [aCollection allSatisfy: [:e | e isCharacter]]]) ifFalse: [^super union: aCollection]. + (self species = aCollection species and: [self class ~= aCollection class]) ifTrue: [^aCollection union: self]. + ^self copy addAll: aCollection; yourself! Item was added: + ----- Method: ByteCharacterSet>>wideCharacterMap (in category 'private') ----- + wideCharacterMap + "used for comparing with WideByteCharacterSet" + + | wide | + wide := WideByteCharacterSet new. + wide addAll: self. + ^wide wideCharacterMap! Item was changed: ----- Method: CharacterSet class>>crlf (in category 'accessing') ----- crlf + ^CrLf ifNil: [ CrLf := ByteCharacterSet with: Character cr with: Character lf ]! - ^CrLf ifNil: [ CrLf := self with: Character cr with: Character lf ]! Item was changed: ----- Method: CharacterSet class>>empty (in category 'instance creation') ----- empty "return an empty set of characters" + ^ByteCharacterSet new! - ^self new! Item was changed: ----- Method: CharacterSet class>>newFrom: (in category 'instance creation') ----- newFrom: aCollection | newCollection | + newCollection := ByteCharacterSet new. - newCollection := self new. newCollection addAll: aCollection. ^newCollection! Item was removed: - ----- Method: CharacterSetComplement>>findFirstInByteString:startingAt: (in category 'enumerating') ----- - findFirstInByteString: aByteString startingAt: startIndex - "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." - ^ByteString - findFirstInString: aByteString - inSet: self byteArrayMap - startingAt: startIndex! Item was removed: - ----- Method: WideCharacterSet>>findFirstInByteString:startingAt: (in category 'enumerating') ----- - findFirstInByteString: aByteString startingAt: startIndex - "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." - - ^ByteString - findFirstInString: aByteString - inSet: byteArrayMap - startingAt: startIndex! Item was removed: - ----- Method: WideCharacterSet>>species (in category 'comparing') ----- - species - ^self hasWideCharacters - ifTrue: [WideCharacterSet] - ifFalse: [CharacterSet]! Item was changed: + (PackageInfo named: 'Collections') postscript: 'CharacterSet allInstancesDo: [:e | ByteCharacterSet adoptInstance: e ]'! - (PackageInfo named: 'Collections') postscript: 'CharacterSet allInstancesDo: #size'!

2 1

The Trunk: Collections-nice.776.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.776.mcz ==================== Summary ==================== Name: Collections-nice.776 Author: nice Time: 1 December 2017, 2:42:56.081887 am UUID: 0682d8f2-1e46-4d55-be53-ed1efc8873cc Ancestors: Collections-nice.775 Rename AbstractCharacterSet->CharacterSet This is Part 2. - remove AbstractCharacterSet - recycle existing CharacterSet as abstract (it previously was byte-CharacterSet but instances have been migrated to ByteCharacterSet in step 1) - keep byteArrayMap instance variable in abstract class, because all CharacterSet can have a map usable for accelerated primitive. - make CharacterSet a factory - clean-up ByteCharacterSet now that it is hooked back as a CharacterSet subclass Note: now CharacterSet allCharacters will return a Set with all characters, including the wide Characters. If you want only the byte characters, then use ByteCharacterSet allCharacters. =============== Diff against Collections-nice.775 =============== Item was removed: - Collection subclass: #AbstractCharacterSet - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Collections-Support'! Item was removed: - ----- Method: AbstractCharacterSet class>>isAbstract (in category 'testing') ----- - isAbstract - ^self = AbstractCharacterSet! Item was removed: - ----- Method: AbstractCharacterSet>>byteArrayMap (in category 'accessing') ----- - byteArrayMap - ^self subclassReponsibility! Item was removed: - ----- Method: AbstractCharacterSet>>findFirstInByteString:startingAt: (in category 'enumerating') ----- - findFirstInByteString: aByteString startingAt: startIndex - "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." - ^ByteString - findFirstInString: aByteString - inSet: self byteArrayMap - startingAt: startIndex! Item was removed: - ----- Method: AbstractCharacterSet>>occurrencesOf: (in category 'enumerating') ----- - occurrencesOf: anObject - "Answer how many of the receiver's elements are equal to anObject. Optimized version." - - (self includes: anObject) ifTrue: [ ^1 ]. - ^0! Item was removed: - ----- Method: AbstractCharacterSet>>removeAll (in category 'removing') ----- - removeAll - self becomeForward: CharacterSet new! Item was removed: - ----- Method: AbstractCharacterSet>>species (in category 'private') ----- - species - ^CharacterSet! Item was changed: + CharacterSet subclass: #ByteCharacterSet + instanceVariableNames: 'tally' + classVariableNames: '' - Collection subclass: #ByteCharacterSet - instanceVariableNames: 'byteArrayMap tally' - classVariableNames: 'CrLf NonSeparators Separators' poolDictionaries: '' category: 'Collections-Support'! !ByteCharacterSet commentStamp: '<historical>' prior: 0! A set of characters. Lookups for inclusion are very fast.! Item was changed: ----- Method: ByteCharacterSet class>>allCharacters (in category 'instance creation') ----- allCharacters + "return a set containing all byte characters" - "return a set containing all characters" + ^ self fromMap: (ByteArray new: 256 withAll: 1)! - | set | - set := self empty. - 0 to: 255 do: [ :ascii | set add: (Character value: ascii) ]. - ^set! Item was removed: - ----- Method: ByteCharacterSet class>>cleanUp: (in category 'initialize-release') ----- - cleanUp: aggressive - - CrLf := NonSeparators := Separators := nil! Item was removed: - ----- Method: ByteCharacterSet class>>crlf (in category 'accessing') ----- - crlf - - ^CrLf ifNil: [ CrLf := self with: Character cr with: Character lf ]! Item was removed: - ----- Method: ByteCharacterSet class>>empty (in category 'instance creation') ----- - empty - "return an empty set of characters" - ^self new! Item was added: + ----- Method: ByteCharacterSet class>>fromMap: (in category 'instance creation') ----- + fromMap: aByteArray + self basicNew fromMap: aByteArray! Item was removed: - ----- Method: ByteCharacterSet class>>newFrom: (in category 'instance creation') ----- - newFrom: aCollection - | newCollection | - newCollection := self new. - newCollection addAll: aCollection. - ^newCollection! Item was removed: - ----- Method: ByteCharacterSet class>>nonSeparators (in category 'accessing') ----- - nonSeparators - "return a set containing everything but the whitespace characters" - - ^NonSeparators ifNil: [ - NonSeparators := self separators complement ]! Item was removed: - ----- Method: ByteCharacterSet class>>separators (in category 'accessing') ----- - separators - "return a set containing just the whitespace characters" - - ^Separators ifNil: [ Separators := self newFrom: Character separators ]! Item was removed: - ----- Method: ByteCharacterSet class>>withAll: (in category 'instance creation') ----- - withAll: aCollection - "Create a new ByteCharacterSet containing all the characters from aCollection." - - ^self newFrom: aCollection! Item was removed: - ----- Method: ByteCharacterSet>>byteComplement (in category 'conversion') ----- - byteComplement - "return a character set containing precisely the single byte characters the receiver does not" - - | set | - set := ByteCharacterSet allCharacters. - self do: [ :c | set remove: c ]. - ^set! Item was removed: - ----- Method: ByteCharacterSet>>complement (in category 'conversion') ----- - complement - "return a character set containing precisely the characters the receiver does not" - - ^ByteCharacterSetComplement of: self copy! Item was removed: - ----- Method: ByteCharacterSet>>findFirstInByteString:startingAt: (in category 'zap me later') ----- - findFirstInByteString: aByteString startingAt: startIndex - "Double dispatching: since we know this is a ByteString, we can use a superfast primitive using a ByteArray map with 0 slots for byte characters not included and 1 for byte characters included in the receiver." - ^ByteString - findFirstInString: aByteString - inSet: self byteArrayMap - startingAt: startIndex! Item was added: + ----- Method: ByteCharacterSet>>fromMap: (in category 'initialize-release') ----- + fromMap: aByteArray + byteArrayMap := aByteArray. + tally := aByteArray count: [:e | e = 1]! Item was changed: + ----- Method: ByteCharacterSet>>initialize (in category 'initialize-release') ----- - ----- Method: ByteCharacterSet>>initialize (in category 'private') ----- initialize - byteArrayMap := ByteArray new: 256. tally := 0! Item was removed: - ----- Method: ByteCharacterSet>>occurrencesOf: (in category 'zap me later') ----- - occurrencesOf: anObject - "Answer how many of the receiver's elements are equal to anObject. Optimized version." - - (self includes: anObject) ifTrue: [ ^1 ]. - ^0! Item was removed: - ----- Method: ByteCharacterSet>>species (in category 'zap me later') ----- - species - ^CharacterSet! Item was changed: ----- Method: ByteCharacterSet>>union: (in category 'enumerating') ----- union: aCollection + (self isCharacters: aCollection) ifFalse: [^super union: aCollection]. - (self species = aCollection species or: [aCollection isString or: [aCollection allSatisfy: [:e | e isCharacter]]]) ifFalse: [^super union: aCollection]. (self species = aCollection species and: [self class ~= aCollection class]) ifTrue: [^aCollection union: self]. ^self copy addAll: aCollection; yourself! Item was changed: ----- Method: ByteCharacterSet>>wideCharacterMap (in category 'private') ----- wideCharacterMap "used for comparing with WideByteCharacterSet" | wide | + wide := WideCharacterSet new. - wide := WideByteCharacterSet new. wide addAll: self. ^wide wideCharacterMap! Item was changed: + Collection subclass: #CharacterSet + instanceVariableNames: 'byteArrayMap' - AbstractCharacterSet subclass: #CharacterSet - instanceVariableNames: 'map tally' classVariableNames: 'CrLf NonSeparators Separators' poolDictionaries: '' category: 'Collections-Support'! !CharacterSet commentStamp: '<historical>' prior: 0! A set of characters. Lookups for inclusion are very fast.! Item was changed: ----- Method: CharacterSet class>>allCharacters (in category 'instance creation') ----- allCharacters "return a set containing all characters" + ^ self empty complement! - | set | - set := self empty. - 0 to: 255 do: [ :ascii | set add: (Character value: ascii) ]. - ^set! Item was changed: ----- Method: CharacterSet class>>crlf (in category 'accessing') ----- crlf + ^CrLf ifNil: [ CrLf := self with: Character cr with: Character lf ]! - ^CrLf ifNil: [ CrLf := ByteCharacterSet with: Character cr with: Character lf ]! Item was changed: ----- Method: CharacterSet class>>empty (in category 'instance creation') ----- empty "return an empty set of characters" + ^self new! - ^ByteCharacterSet new! Item was added: + ----- Method: CharacterSet class>>isAbstract (in category 'testing') ----- + isAbstract + ^self = CharacterSet! Item was added: + ----- Method: CharacterSet class>>new (in category 'instance creation') ----- + new + self = CharacterSet ifTrue: [^ByteCharacterSet new]. + ^super new! Item was changed: ----- Method: CharacterSet class>>newFrom: (in category 'instance creation') ----- newFrom: aCollection | newCollection | + newCollection := self new. - newCollection := ByteCharacterSet new. newCollection addAll: aCollection. ^newCollection! Item was removed: - ----- Method: CharacterSet>>= (in category 'comparing') ----- - = anObject - - self species == anObject species ifFalse: [ ^false ]. - anObject size = tally ifFalse: [ ^false ]. - ^self byteArrayMap = anObject byteArrayMap! Item was removed: - ----- Method: CharacterSet>>add: (in category 'adding') ----- - add: aCharacter - "I automatically become a WideCharacterSet if you add a wide character to myself" - - | index | - (index := aCharacter asInteger + 1) <= 256 ifFalse: [ - | wide | - wide := WideCharacterSet new. - wide addAll: self. - wide add: aCharacter. - self becomeForward: wide. - ^aCharacter ]. - (map at: index) = 1 ifFalse: [ - map at: index put: 1. - tally := tally + 1 ]. - ^aCharacter! Item was removed: - ----- Method: CharacterSet>>asString (in category 'conversion') ----- - asString - "Convert the receiver into a String" - - ^String new: self size streamContents:[:s| - self do:[:ch| s nextPut: ch]. - ].! Item was changed: + ----- Method: CharacterSet>>byteArrayMap (in category 'accessing') ----- - ----- Method: CharacterSet>>byteArrayMap (in category 'private') ----- byteArrayMap "return a ByteArray mapping each ascii value to a 1 if that ascii value is in the set, and a 0 if it isn't. Intended for use by primitives only" + ^byteArrayMap ifNil: [self initializeByteArrayMap]! - ^map! Item was changed: + ----- Method: CharacterSet>>byteComplement (in category 'converting') ----- - ----- Method: CharacterSet>>byteComplement (in category 'conversion') ----- byteComplement "return a character set containing precisely the single byte characters the receiver does not" + ^ ByteCharacterSet fromMap: (self byteArrayMap collect: [:i | 1 - i])! - | set | - set := CharacterSet allCharacters. - self do: [ :c | set remove: c ]. - ^set! Item was added: + ----- Method: CharacterSet>>canBeEnumerated (in category 'testing') ----- + canBeEnumerated + ^true! Item was changed: + ----- Method: CharacterSet>>complement (in category 'converting') ----- - ----- Method: CharacterSet>>complement (in category 'conversion') ----- complement "return a character set containing precisely the characters the receiver does not" ^CharacterSetComplement of: self copy! Item was removed: - ----- Method: CharacterSet>>do: (in category 'enumerating') ----- - do: aBlock - "evaluate aBlock with each character in the set" - - | index | - tally >= 128 ifTrue: [ "dense" - index := 0. - [ (index := index + 1) <= 256 ] whileTrue: [ - (map at: index) = 1 ifTrue: [ - aBlock value: (Character value: index - 1) ] ]. - ^self ]. - "sparse" - index := 0. - [ (index := map indexOf: 1 startingAt: index + 1) = 0 ] whileFalse: [ - aBlock value: (Character value: index - 1) ]. - ! Item was removed: - ----- Method: CharacterSet>>hasWideCharacters (in category 'testing') ----- - hasWideCharacters - ^false! Item was removed: - ----- Method: CharacterSet>>hash (in category 'comparing') ----- - hash - ^self byteArrayMap hash! Item was removed: - ----- Method: CharacterSet>>includes: (in category 'testing') ----- - includes: anObject - - | index | - anObject isCharacter ifFalse: [ ^false ]. - (index := anObject asInteger + 1) > 256 ifTrue: [ ^false ]. - ^(map at: index) > 0! Item was removed: - ----- Method: CharacterSet>>initialize (in category 'private') ----- - initialize - - map := ByteArray new: 256. - tally := 0! Item was added: + ----- Method: CharacterSet>>initializeByteArrayMap (in category 'private') ----- + initializeByteArrayMap + byteArrayMap := (0 to: 255) asByteArray collect: + [:i | (self includes: (Character value: i)) ifTrue: [1] ifFalse: [0]]! Item was added: + ----- Method: CharacterSet>>isCharacters: (in category 'testing') ----- + isCharacters: aCollection + "Answer whether this collection contains characters" + ^self species = aCollection species or: [aCollection isString or: [aCollection allSatisfy: [:e | e isCharacter]]]! Item was removed: - ----- Method: CharacterSet>>isEmpty (in category 'testing') ----- - isEmpty - ^tally = 0! Item was added: + ----- Method: CharacterSet>>occurrencesOf: (in category 'enumerating') ----- + occurrencesOf: anObject + "Answer how many of the receiver's elements are equal to anObject. Optimized version." + + (self includes: anObject) ifTrue: [ ^1 ]. + ^0! Item was changed: ----- Method: CharacterSet>>postCopy (in category 'copying') ----- postCopy super postCopy. + byteArrayMap := byteArrayMap copy! - map := map copy! Item was removed: - ----- Method: CharacterSet>>remove: (in category 'removing') ----- - remove: aCharacter - - ^self remove: aCharacter ifAbsent: aCharacter! Item was removed: - ----- Method: CharacterSet>>remove:ifAbsent: (in category 'removing') ----- - remove: aCharacter ifAbsent: aBlock - - | index | - (index := aCharacter asciiValue + 1) <= 256 ifFalse: [ ^aBlock value ]. - (map at: index) = 0 ifTrue: [ ^aBlock value ]. - map at: index put: 0. - tally := tally - 1. - ^aCharacter! Item was changed: ----- Method: CharacterSet>>removeAll (in category 'removing') ----- removeAll + self becomeForward: ByteCharacterSet new! - - map atAllPut: 0. - tally := 0! Item was changed: + ----- Method: CharacterSet>>species (in category 'private') ----- - ----- Method: CharacterSet>>species (in category 'comparing') ----- species ^CharacterSet! Item was removed: - ----- Method: CharacterSet>>union: (in category 'enumerating') ----- - union: aCollection - aCollection class = CharacterSetComplement ifTrue: [^aCollection union: self]. - (self species = aCollection species or: [aCollection isString]) ifFalse: [^super union: aCollection]. - ^self copy addAll: aCollection; yourself! Item was removed: - ----- Method: CharacterSet>>wideCharacterMap (in category 'private') ----- - wideCharacterMap - "used for comparing with WideCharacterSet" - - | wide | - wide := WideCharacterSet new. - wide addAll: self. - ^wide wideCharacterMap! Item was changed: + CharacterSet subclass: #CharacterSetComplement + instanceVariableNames: 'absent' - AbstractCharacterSet subclass: #CharacterSetComplement - instanceVariableNames: 'absent byteArrayMapCache' classVariableNames: '' poolDictionaries: '' category: 'Collections-Support'! !CharacterSetComplement commentStamp: 'nice 8/31/2008 14:53' prior: 0! CharacterSetComplement is a space efficient implementation of (CharacterSet complement) taking care of WideCharacter (code > 255) However, it will maintain a byteArrayMap for character <= 255 in a cache keeping instance variables: absent <CharacterSet> contains character that are not in the set (i.e. my complement) byteArrayMapCache <ByteArray | nil> cache this information because it has to be used in tight loops where efficiency matters! Item was changed: ----- Method: CharacterSetComplement>>add: (in category 'adding') ----- add: aCharacter "a character is present if not absent, so adding a character is removing it from the absent" (absent includes: aCharacter) ifTrue: + [byteArrayMap := nil. - [byteArrayMapCache := nil. absent remove: aCharacter]. ^ aCharacter! Item was removed: - ----- Method: CharacterSetComplement>>byteArrayMap (in category 'private') ----- - byteArrayMap - "return a ByteArray mapping each ascii value to a 1 if that ascii value is in the set, and a 0 if it isn't. Intended for use by primitives only" - - ^byteArrayMapCache ifNil: [byteArrayMapCache := absent byteArrayMap collect: [:i | 1 - i]]! Item was added: + ----- Method: CharacterSetComplement>>canBeEnumerated (in category 'testing') ----- + canBeEnumerated + ^false! Item was changed: ----- Method: CharacterSetComplement>>complement: (in category 'initialize-release') ----- complement: aCharacterSet "initialize with the complement" + byteArrayMap := nil. - byteArrayMapCache := nil. absent := aCharacterSet. ! Item was changed: ----- Method: CharacterSetComplement>>remove: (in category 'removing') ----- remove: aCharacter "This means aCharacter is now absent from myself. It must be added to my absent." + byteArrayMap := nil. - byteArrayMapCache := nil. ^absent add: aCharacter! Item was changed: ----- Method: CharacterSetComplement>>union: (in category 'enumerating') ----- union: aCollection aCollection class = self class ifTrue: [^(self complement intersection: aCollection complement) complement]. + (self isCharacters: aCollection) ifFalse: [^super union: aCollection]. - (aCollection species = CharacterSet or: [aCollection isString]) ifFalse: [^self error: 'no way to compute the union, this collection is too big']. ^(absent reject: [:e | aCollection includes: e]) complement! Item was changed: + CharacterSet subclass: #LazyCharacterSet + instanceVariableNames: 'block' - AbstractCharacterSet subclass: #LazyCharacterSet - instanceVariableNames: 'block byteArrayMapCache' classVariableNames: '' poolDictionaries: '' category: 'Collections-Support'! !LazyCharacterSet commentStamp: 'nice 11/30/2017 21:40' prior: 0! A LazyCharacterSet is a kind of CharacterSet which does not know in advance which Character it contains or not. If will lazily evaluate a block on demand if ever one ask whether it includes: a character. It is not feasible to enumerate a LazyCharacterSet, because there are way too many characters. Instance Variables block: <BlockContext | Symbol> byteArrayMapCache: <ByteArray | nil> block - a valuable, answering either true or false when sent the message value: - true means that this set includes the character passed as value: argument. byteArrayMapCache - a cache holding 0 or 1 for the first 256 character codes - 0 meaning not included, 1 included. This is used in some priitives ! Item was changed: ----- Method: LazyCharacterSet>>block: (in category 'accessing') ----- block: aValuable "Set the block used to determine if I include a Character or not. aValuable is an object that shoud answer true or false when sent value:" + byteArrayMap := nil. - byteArrayMapCache := nil. block := aValuable! Item was removed: - ----- Method: LazyCharacterSet>>byteArrayMap (in category 'accessing') ----- - byteArrayMap - "return a ByteArray mapping each ascii value to a 1 if that ascii value is in the set, and a 0 if it isn't. Intended for use by primitives only" - - ^byteArrayMapCache ifNil: [byteArrayMapCache := (0 to: 255) collect: [:i | self includes: (Character value: i)]]! Item was added: + ----- Method: LazyCharacterSet>>canBeEnumerated (in category 'testing') ----- + canBeEnumerated + ^false! Item was added: + ----- Method: LazyCharacterSet>>intersection: (in category 'enumerating') ----- + intersection: aCollection + (self species = aCollection species or: [aCollection isString or: [aCollection allSatisfy: [:e | e isCharacter]]]) ifFalse: [^super intersection: aCollection]. + ^self class including: [:c | (aCollection includes: c) and: [block value: c]]! Item was added: + ----- Method: LazyCharacterSet>>union: (in category 'enumerating') ----- + union: aCollection + (self isCharacters: aCollection) ifFalse: [^super union: aCollection]. + ^self class including: [:c | (aCollection includes: c) or: [block value: c]]! Item was changed: + CharacterSet subclass: #WideCharacterSet + instanceVariableNames: 'map bitsetCapacity highBitsShift lowBitsMask' - AbstractCharacterSet subclass: #WideCharacterSet - instanceVariableNames: 'map byteArrayMap bitsetCapacity highBitsShift lowBitsMask' classVariableNames: '' poolDictionaries: '' category: 'Collections-Support'! !WideCharacterSet commentStamp: 'nice 12/10/2009 19:17' prior: 0! WideCharacterSet is used to store a Set of WideCharacter with fast access and inclusion test. Implementation should be efficient in memory if sets are sufficently sparse. Wide Characters are at most 32bits. We split them into 16 highBits and 16 lowBits. map is a dictionary key: 16 highBits value: map of 16 lowBits. Maps of lowBits are stored as arrays of bits in a ByteArray. If a bit is set to 1, this indicate that corresponding character is present. 8192 bytes are necessary in each lowmap. Empty lowmap are removed from the map Dictionary. A byteArrayMap is maintained in parallel with map for fast handling of ByteString. (byteArrayMap at: i+1) = 0 means that character of asciiValue i is absent, = 1 means present.! Item was changed: ----- Method: WideCharacterSet>>= (in category 'comparing') ----- = anObject + ^self species == anObject species + and: [ anObject canBeEnumerated + and: [ self wideCharacterMap = anObject wideCharacterMap ] ]! - ^self species == anObject species and: [ - self wideCharacterMap = anObject wideCharacterMap ]! Item was removed: - ----- Method: WideCharacterSet>>complement (in category 'converting') ----- - complement - "return a character set containing precisely the characters the receiver does not" - - ^CharacterSetComplement of: self copy! Item was changed: ----- Method: WideCharacterSet>>union: (in category 'enumerating') ----- union: aCollection + (self isCharacters: aCollection) ifFalse: [^super union: aCollection]. + (self species = aCollection species and: [self class ~= aCollection class]) ifTrue: [^aCollection union: self]. - (self species = aCollection species or: [aCollection isString]) ifFalse: [^super union: aCollection]. ^self copy addAll: aCollection; yourself!

1 0

The Inbox: EToys-dtl.316.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

David T. Lewis uploaded a new version of EToys to project The Inbox: http://source.squeak.org/inbox/EToys-dtl.316.mcz ==================== Summary ==================== Name: EToys-dtl.316 Author: dtl Time: 30 November 2017, 8:01:53.317128 pm UUID: 1f54a00d-e84f-4edc-be26-c47b4c341103 Ancestors: EToys-dtl.315 Remove references to global World from WiWPasteUpMorph. In places where the World is assigned, instead call MorphicProject>>setWorld: which will set the world for Project current, and also set the global World if present in the image. This is expected to be consistent with current Squeak behavior, for which the value of World is Project current world. This requires testing (not done) to verify if this behavior is consistent with the original design intent of WiWPasteUpMorph. In the common case of transitioning from one project to another, the global World is set as the new project becomes current (and active). This update is a best effort to achieve similar behavior for becomeTheActiveWorldWith: and revertToPartentWorldWithEvent: in WiWPasteUpMorph. =============== Diff against EToys-dtl.315 =============== Item was changed: ----- Method: WiWPasteUpMorph>>becomeTheActiveWorldWith: (in category 'activation') ----- becomeTheActiveWorldWith: evt "Make the receiver become the active world, and give its hand the event provided, if not nil" | outerWorld | + Project current world == self ifTrue: [^ self]. - World == self ifTrue: [^ self]. worldState resetDamageRecorder. "since we may have moved, old data no longer valid" hostWindow setStripeColorsFrom: Color green. worldState canvas: nil. "safer to start from scratch" displayChangeSignatureOnEntry := Display displayChangeSignature. "Messy stuff to clear flaps from outer world" Flaps globalFlapTabsIfAny do: [:f | f changed]. + outerWorld := Project current world. + Project current setWorld: self. - outerWorld := World. - World := self. self installFlaps. + Project current setWorld: outerWorld. - World := outerWorld. outerWorld displayWorld. + Project current setWorld: self. - World := self. self viewBox: hostWindow panelRect. self startSteppingSubmorphsOf: self. self changed. pendingEvent := nil. evt ifNotNil: [self primaryHand handleEvent: (evt setHand: self primaryHand)]. ! Item was changed: ----- Method: WiWPasteUpMorph>>displayWorld (in category 'world state') ----- displayWorld "RAA 27 Nov 99 - if we are not active, then the parent should do the drawing" self flag: #bob. "probably not needed" + Project current world == self ifTrue: [^super displayWorld]. - World == self ifTrue: [^super displayWorld]. parentWorld ifNotNil: [^parentWorld displayWorld]. ^super displayWorld "in case MVC needs it"! Item was changed: ----- Method: WiWPasteUpMorph>>initialize (in category 'initialization') ----- initialize super initialize. + parentWorld := Project current world. - parentWorld := World. ! Item was changed: ----- Method: WiWPasteUpMorph>>mouseDown: (in category 'event handling') ----- mouseDown: evt + | world | + world := Project current world. + (world == self or: [world isNil]) ifTrue: [^ super mouseDown: evt]. - (World == self or: [World isNil]) ifTrue: [^ super mouseDown: evt]. (self bounds containsPoint: evt cursorPoint) ifFalse: [^ self]. self becomeTheActiveWorldWith: evt. ! Item was changed: ----- Method: WiWPasteUpMorph>>restoreDisplay (in category 'world state') ----- restoreDisplay + Project current world ifNotNil: [ :w | w restoreMorphicDisplay]. + "Comment from original method ar 3/18/2001: I don't actually expect this to be called"! - World ifNotNil:[World restoreMorphicDisplay]. "I don't actually expect this to be called"! Item was changed: ----- Method: WiWPasteUpMorph>>revertToParentWorldWithEvent: (in category 'activation') ----- revertToParentWorldWithEvent: evt "RAA 27 Nov 99 - if the display changed while we were in charge, parent may need to redraw" worldState resetDamageRecorder. "Terminate local display" + Project current setWorld: parentWorld. + parentWorld assuredCanvas. + parentWorld installFlaps. - World := parentWorld. - World assuredCanvas. - World installFlaps. hostWindow setStripeColorsFrom: Color red. (displayChangeSignatureOnEntry = Display displayChangeSignature) ifFalse: [ + parentWorld fullRepaintNeeded; displayWorld - World fullRepaintNeeded; displayWorld ]. + evt ifNotNil: [parentWorld restartWorldCycleWithEvent: evt]. - evt ifNotNil: [World restartWorldCycleWithEvent: evt]. !

2 1

The Trunk: EToys-dtl.315.mcz
by commits＠source.squeak.org 01 Dec '17

01 Dec '17

David T. Lewis uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-dtl.315.mcz ==================== Summary ==================== Name: EToys-dtl.315 Author: dtl Time: 29 November 2017, 9:45:42.436285 pm UUID: 877a21b3-739f-4c05-8bec-bb5a153d1dbe Ancestors: EToys-dtl.314 SyntaxMorph requires asMorphicSyntaxIn: and related methods from the ParseNode hierarchy. This update adds the missing methods imported from the Etoys development image. SyntaxMorph class>>testAll exposes some problems in these earlier ParseNode methods, and this probably reflects updates that will be required to match the various compiler improvements in Squeak since the original SyntaxMorph implementation. =============== Diff against EToys-dtl.314 =============== Item was added: + ----- Method: AssignmentNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^parent assignmentNode: self variable: variable value: value! Item was added: + ----- Method: BlockNode>>asMorphicCollectSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicCollectSyntaxIn: parent + + ^parent + blockNodeCollect: self + arguments: arguments + statements: statements! Item was added: + ----- Method: BlockNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^parent + blockNode: self + arguments: arguments + statements: statements! Item was added: + ----- Method: BraceNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + | row | + + row _ (parent addRow: #brace on: self) layoutInset: 1. + row addMorphBack: (StringMorph new contents: + (String streamContents: [:aStream | self printOn: aStream indent: 0])). + ^row + ! Item was added: + ----- Method: CascadeNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^parent + cascadeNode: self + receiver: receiver + messages: messages + ! Item was added: + ----- Method: LiteralNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + | row | + + row _ parent addRow: #literal on: self. + (key isVariableBinding) ifFalse: [ + row layoutInset: 1. + ^ row addMorphBack: (row addString: key storeString special: false)]. + key key isNil ifTrue: [ + ^ row addTextRow: ('###',key value soleInstance name) + ] ifFalse: [ + ^ row addTextRow: ('##', key key) + ]. ! Item was added: + ----- Method: MessageNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^parent + vanillaMessageNode: self + receiver: receiver + selector: selector + arguments: arguments + ! Item was added: + ----- Method: MessageNode>>morphFromKeywords:arguments:on:indent: (in category '*Etoys-tiles') ----- + morphFromKeywords: key arguments: args on: parent indent: ignored + + ^parent + messageNode: self + receiver: receiver + selector: selector + keywords: key + arguments: args + ! Item was added: + ----- Method: MethodNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^parent + methodNodeInner: self + selectorOrFalse: selectorOrFalse + precedence: precedence + arguments: arguments + temporaries: temporaries + primitive: primitive + block: block + ! Item was added: + ----- Method: MethodNode>>asMorphicSyntaxUsing: (in category '*Etoys-tiles') ----- + asMorphicSyntaxUsing: aClass + + ^ Cursor wait showWhile: [ + (aClass methodNodeOuter: self) finalAppearanceTweaks] + ! Item was added: + ----- Method: MorphicProject>>setWorld: (in category '*Etoys-Worlds') ----- + setWorld: aWorld + world := aWorld. + Smalltalk globals at: #World + ifPresent: [ :w | Smalltalk globals at: #World put: world ]. + ! Item was added: + ----- Method: ParseNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + | morph | + "Default for missing implementations" + + morph _ parent addColumn: #error on: self. + morph addTextRow: self class printString. + ^morph + + + ! Item was added: + ----- Method: ReturnNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^parent returnNode: self expression: expr + ! Item was added: + ----- Method: TempVariableNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^ parent addToken: self name type: #tempVariable on: self! Item was added: + ----- Method: VariableNode>>asMorphicSyntaxIn: (in category '*Etoys-tiles') ----- + asMorphicSyntaxIn: parent + + ^ parent addToken: self name + type: #variable + on: self clone "don't hand out the prototype!! See VariableNode>>initialize" + ! Item was added: + ----- Method: VariableNode>>currentValueIn: (in category '*Etoys-tiles') ----- + currentValueIn: aContext + + aContext ifNil: [^nil]. + ^((self variableGetterBlockIn: aContext) ifNil: [^nil]) value printString + + + ! Item was added: + ----- Method: VariableNode>>variableGetterBlockIn: (in category '*Etoys-tiles') ----- + variableGetterBlockIn: aContext + + | temps index ivars | + + (self type = 4 and: [self key isVariableBinding]) ifTrue: [ + ^[self key value] + ]. + aContext ifNil: [^nil]. + self isSelfPseudoVariable ifTrue: [^[aContext receiver]]. + self type = 1 ifTrue: [ + ivars _ aContext receiver class allInstVarNames. + index _ ivars indexOf: self name ifAbsent: [^nil]. + ^[aContext receiver instVarAt: index] + ]. + self type = 2 ifTrue: [ + temps _ aContext tempNames. + index _ temps indexOf: self name ifAbsent: [^nil]. + ^[aContext tempAt: index] + ]. + ^nil + !

2 1

Is SyntaxMorph important?
by David T. Lewis 01 Dec '17

01 Dec '17

SyntaxMorph is in the Etoys package, but is missing the asMorphicSyntaxIn: methods that are needed in the ParseNode hierarchy. I tried importing the missing methods from an Etoys development image, which is sufficient to make SyntaxMorph class>>test work. But SyntaxMorph class>>testAll runs into problems, so I am expecting that the various compiler and Spur enhancements in recent years mean that some work would need to be done in this area. I am inclined to commit the current (old) version the missing methods to the Etoys package, but I do not want to do that if they were intentionally removed or if someone has a plan to provide a fully working update. Dave

4 7

Jump to page: