Skip to content

Commit

Permalink
Method category cleanup - pass 3
Browse files Browse the repository at this point in the history
  • Loading branch information
astares committed Jun 7, 2021
1 parent d5a0973 commit 43f059c
Show file tree
Hide file tree
Showing 113 changed files with 995 additions and 714 deletions.
4 changes: 2 additions & 2 deletions src/AST-Core/RBProgramNode.class.st
Expand Up @@ -972,13 +972,13 @@ RBProgramNode >> replaceNode: aNode withNode: anotherNode [
self error: 'I don''t store other nodes'
]

{ #category : #'private-replacing' }
{ #category : #'private - replacing' }
RBProgramNode >> replaceSourceFrom: aNode [
self == aNode
ifFalse: [ self clearReplacements ]
]

{ #category : #'private-replacing' }
{ #category : #'private - replacing' }
RBProgramNode >> replaceSourceWith: aNode [
aNode replaceSourceFrom: self
]
Expand Down
6 changes: 3 additions & 3 deletions src/Athens-Morphic/AthensCanvasWrapper.class.st
Expand Up @@ -42,7 +42,7 @@ AthensCanvasWrapper >> canvas: anAthensCanvas [
athensCanvas := anAthensCanvas
]

{ #category : #'private clip transform' }
{ #category : #'private - clip transform' }
AthensCanvasWrapper >> canvasClipBy: aClipRect during: aBlock [
| oldRect |
oldRect := self clipRect.
Expand All @@ -61,7 +61,7 @@ AthensCanvasWrapper >> clipRect [
^ self canvas clipRect
]

{ #category : #'private clip transform' }
{ #category : #'private - clip transform' }
AthensCanvasWrapper >> clipWrapperAndAthensTransformBy: aDisplayTransform clippingTo: aClipRect during: aBlock smoothing: cellSize [
"the clipTransform methods are just trial and error attemps on getting this right"
| rect |
Expand All @@ -78,7 +78,7 @@ AthensCanvasWrapper >> clipWrapperAndAthensTransformBy: aDisplayTransform clippi
aBlock value: self ] ] "]"
]

{ #category : #'private clip transform' }
{ #category : #'private - clip transform' }
AthensCanvasWrapper >> clipWrapperTransformBy: aDisplayTransform clippingTo: aClipRect during: aBlock smoothing: cellSize [
"the clipTransform methods are just trial and error attemps on getting this right"
| rect |
Expand Down
8 changes: 4 additions & 4 deletions src/ClassParser/CDAbstractClassDefinitionParser.class.st
Expand Up @@ -41,7 +41,7 @@ CDAbstractClassDefinitionParser >> beTraitDefinition [
classDefinition := CDTraitDefinitionNode new
]

{ #category : #'private class factory' }
{ #category : #'private - class factory' }
CDAbstractClassDefinitionParser >> classNameNodeClass [
^ CDClassNameNode
]
Expand Down Expand Up @@ -228,18 +228,18 @@ CDAbstractClassDefinitionParser >> setAdequateClassDefinitionFrom: expressionTre
ifFalse: [ self beMetaclassDefinition ]
]

{ #category : #'private class factory' }
{ #category : #'private - class factory' }
CDAbstractClassDefinitionParser >> sharedPoolNodeClass [
^ CDSharedPoolNode
]

{ #category : #'private class factory' }
{ #category : #'private - class factory' }
CDAbstractClassDefinitionParser >> slotInitializationNodeClass [

^ RBSlotInitializationNode
]

{ #category : #'private class factory' }
{ #category : #'private - class factory' }
CDAbstractClassDefinitionParser >> slotNodeClass [
^ CDSlotNode
]
22 changes: 11 additions & 11 deletions src/Compression/ZipArchiveMember.class.st
Expand Up @@ -154,7 +154,7 @@ ZipArchiveMember >> clearExtraFields [
localExtraField := ''
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> compressDataTo: aStream [
"Copy my deflated data to the given stream."
| encoder startPos endPos |
Expand Down Expand Up @@ -227,15 +227,15 @@ ZipArchiveMember >> contentsFrom: start to: finish [
^s contents
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> copyDataTo: aStream [

compressionMethod = CompressionStored ifTrue: [ ^self copyDataWithCRCTo: aStream ].

self copyRawDataTo: aStream
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> copyDataWithCRCTo: aStream [
"Copy my data to aStream. Also set the CRC-32.
Only used when compressionMethod = desiredCompressionMethod = CompressionStored"
Expand All @@ -255,7 +255,7 @@ ZipArchiveMember >> copyDataWithCRCTo: aStream [

]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> copyRawDataTo: aStream [

[ readDataRemaining > 0 ] whileTrue: [ | data |
Expand All @@ -264,7 +264,7 @@ ZipArchiveMember >> copyRawDataTo: aStream [
readDataRemaining := readDataRemaining - data size ]
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> copyRawDataTo: aStream from: start to: finish [

readDataRemaining := readDataRemaining min: finish - start + 1.
Expand Down Expand Up @@ -420,7 +420,7 @@ ZipArchiveMember >> extractTo: aStream from: start to: finish [
self endRead
]

{ #category : #'private-extraction' }
{ #category : #'private - extraction' }
ZipArchiveMember >> extractToFile: aFile informingOverwrite: shouldOverwrite onSuccess: successBlock onRetryWithOverwrite: retryWithOverwriteBlock onFailedOverwrite: failedBlock onAbortOverwrite: abortBlock [
"Extract this entry into the given file. Answer successBlock or call one of the other action blocks."

Expand Down Expand Up @@ -695,7 +695,7 @@ ZipArchiveMember >> versionNeededToExtract: anInteger [
versionNeededToExtract := anInteger
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> writeCentralDirectoryFileHeaderTo: aStream [
"C2 v3 V4 v5 V2"

Expand Down Expand Up @@ -736,7 +736,7 @@ ZipArchiveMember >> writeCentralDirectoryFileHeaderTo: aStream [
aStream nextPutAll: systemFileComment
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> writeDataDescriptorTo: aStream [
"This writes a data descriptor to the given stream.
Assumes that crc32, writeOffset, and uncompressedSize are
Expand All @@ -749,7 +749,7 @@ ZipArchiveMember >> writeDataDescriptorTo: aStream [
aStream nextLittleEndianNumber: 4 put: uncompressedSize
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> writeDataTo: aStream [
"Copy my (possibly inflated or deflated) data to the given stream.
This might do compression, decompression, or straight copying, depending
Expand All @@ -768,7 +768,7 @@ ZipArchiveMember >> writeDataTo: aStream [
self copyDataTo: aStream.
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> writeDataTo: aStream from: start to: finish [
"Copy my (possibly inflated or deflated) data to the given stream.
But only the specified byte range.
Expand All @@ -788,7 +788,7 @@ ZipArchiveMember >> writeDataTo: aStream from: start to: finish [
self copyRawDataTo: aStream from: start to: finish.
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipArchiveMember >> writeLocalFileHeaderTo: aStream [
"Write my local header to a file handle.
Stores the offset to the start of the header in my
Expand Down
2 changes: 1 addition & 1 deletion src/Compression/ZipDirectoryMember.class.st
Expand Up @@ -58,7 +58,7 @@ ZipDirectoryMember >> usesFile: aFileReferenceOrFileName [
^false
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipDirectoryMember >> writeDataTo: aStream [
"Write nothing. Directories have no contents to write."
]
24 changes: 12 additions & 12 deletions src/Compression/ZipFileMember.class.st
Expand Up @@ -19,7 +19,7 @@ ZipFileMember class >> newFrom: stream named: fileName [
^(self new) stream: stream externalFileName: fileName
]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> canonicalizeFileName [
"For security reasons, make all paths relative and remove any ../ portions"

Expand All @@ -32,7 +32,7 @@ ZipFileMember >> close [
stream ifNotNil:[stream close].
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipFileMember >> copyDataTo: aStream [

self copyRawDataTo: aStream.
Expand All @@ -46,7 +46,7 @@ ZipFileMember >> initialize [
dataOffset := 0.
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipFileMember >> localHeaderRelativeOffset [
^localHeaderRelativeOffset
]
Expand All @@ -57,7 +57,7 @@ ZipFileMember >> looksLikeDirectory [
and: [ uncompressedSize = 0 ]
]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> readCentralDirectoryFileHeaderFrom: aStream [
"Assumes aStream positioned after signature"

Expand Down Expand Up @@ -91,7 +91,7 @@ ZipFileMember >> readCentralDirectoryFileHeaderFrom: aStream [
self desiredCompressionMethod: compressionMethod
]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> readFrom: aStream [
"assumes aStream positioned after CD header; leaves stream positioned after my CD entry"

Expand All @@ -102,7 +102,7 @@ ZipFileMember >> readFrom: aStream [

]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> readLocalDirectoryFileHeaderFrom: aStream [
"Positions stream as necessary. Will return stream to its original position"

Expand Down Expand Up @@ -144,12 +144,12 @@ ZipFileMember >> readLocalDirectoryFileHeaderFrom: aStream [
aStream position: oldPos.
]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> readRawChunk: n [
^stream next: n
]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> rewindData [
super rewindData.
(stream isNil or: [ stream closed ])
Expand All @@ -158,7 +158,7 @@ ZipFileMember >> rewindData [
self skipLocalDirectoryFileHeaderFrom: stream.
]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> skipLocalDirectoryFileHeaderFrom: aStream [
"Assumes that stream is positioned after signature."

Expand All @@ -180,7 +180,7 @@ ZipFileMember >> stream: aStream externalFileName: aFileName [
externalFileName := aFileName.
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipFileMember >> uncompressDataTo: aStream [

| decoder buffer crcErrorMessage |
Expand All @@ -202,7 +202,7 @@ ZipFileMember >> uncompressDataTo: aStream [

]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipFileMember >> uncompressDataTo: aStream from: start to: finish [

| decoder buffer chunkSize |
Expand All @@ -220,7 +220,7 @@ ZipFileMember >> uncompressDataTo: aStream from: start to: finish [

]

{ #category : #'private-reading' }
{ #category : #'private - reading' }
ZipFileMember >> unzipTimestamp: dosTimestampInteger [

^ [ DateAndTime fromDosTimestamp: dosTimestampInteger ]
Expand Down
2 changes: 1 addition & 1 deletion src/Compression/ZipStringMember.class.st
Expand Up @@ -43,7 +43,7 @@ ZipStringMember >> readRawChunk: n [
^stream next: n
]

{ #category : #'private-writing' }
{ #category : #'private - writing' }
ZipStringMember >> rewindData [
super rewindData.
stream := contents readStream.
Expand Down

0 comments on commit 43f059c

Please sign in to comment.