Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

20759 Unused temps in Metacello classes #546

Merged
merged 2 commits into from Nov 27, 2017
Merged

20759 Unused temps in Metacello classes #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff85d31
Fix unused temps
astares Nov 25, 2017
8cee85d
Add space to trigger CI
astares Nov 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Metacello-Core/MetacelloMemberListSpec.class.st
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ Class {
#superclass : #MetacelloSpec,
#instVars : [
'list',
'memberMap'
'memberMap'
],
#category : #'Metacello-Core-Members'
}
Expand Down Expand Up @@ -160,7 +160,7 @@ MetacelloMemberListSpec >> merge: aSpec [
{ #category : #merging }
MetacelloMemberListSpec >> mergeSpec: anotherSpec [

| newSpec val |
| newSpec |
newSpec := super mergeSpec: anotherSpec.
newSpec list: self list copy.
anotherSpec list do: [:groupMember | groupMember applyToList: newSpec ].
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloProject.class.st
View file
Open in desktop
Expand Up @@ -495,7 +495,7 @@ MetacelloProject >> valueHolderSpecClass [

{ #category : #versions }
MetacelloProject >> version: aVersionString [
| vrsn |

aVersionString isSymbol
ifTrue: [
| symbolicVersionString |
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloScriptEngine.class.st
View file
Open in desktop
Expand Up @@ -400,7 +400,7 @@ MetacelloScriptEngine >> lock [
MetacelloScriptEngine >> lookupProjectSpecFor: aProjectSpec [
"if there is no conflict, choose new spec"

| registration loadedSpec |
| registration |
registration := MetacelloProjectRegistration
registrationForProjectSpec: aProjectSpec
ifAbsent: [ :new | new ]
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloSemanticVersionNumber.class.st
View file
Open in desktop
Expand Up @@ -126,7 +126,7 @@ MetacelloSemanticVersionNumber class >> fromString: aString [

{ #category : #'instance creation' }
MetacelloSemanticVersionNumber class >> fromString: aString forPattern: forPattern [
| new tokens preRelease build versionString identifierCount normalEnd preReleaseEnd normalComponents preReleaseComponents buildComponents |
| preRelease build versionString identifierCount normalEnd preReleaseEnd normalComponents preReleaseComponents buildComponents |
normalComponents := OrderedCollection new.
preReleaseComponents := OrderedCollection new.
buildComponents := OrderedCollection new.
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloToolBoxConstructor.class.st
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ MetacelloToolBoxConstructor >> extractMethodSectionsFor: sourceVersionString [

{ #category : #extraction }
MetacelloToolBoxConstructor >> extractSymbolicVersionSpecsFor: sourceVersionSymbol [
| coll versionSpec pragma |
| coll pragma |
coll := self extractSymbolicVersionPragmas at: sourceVersionSymbol ifAbsent: [ ^ #() ].
coll size > 1
ifTrue: [ self error: 'More than one pragma defining ' , sourceVersionSymbol printString ].
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloVersionSpec.class.st
View file
Open in desktop
Expand Up @@ -147,7 +147,7 @@ MetacelloVersionSpec >> configMethodOn: aStream indent: indent [

{ #category : #printing }
MetacelloVersionSpec >> configMethodOn: aStream last: last indent: indent [
| spec hasPackageSpecs |
| hasPackageSpecs |
hasPackageSpecs := false.
self packagesSpec list
do: [ :member |
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-MC/MetacelloMCProjectSpec.class.st
View file
Open in desktop
Expand Up @@ -134,7 +134,7 @@ MetacelloMCProjectSpec >> copyForScriptingInto: aProjectSpec [
MetacelloMCProjectSpec >> determineCurrentVersionForLoad [
"don't use self currentVersion, because we are interested in the currentVersion of the project as loaded in image, not the current version relative to our load list"

| prjct version currentVersion packageAndProjectNames cvs |
| prjct version currentVersion cvs |
self projectClass == nil
ifTrue: [ ^ nil ].
(version := self versionOrNil) == nil
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-MC/MetacelloMCVersion.class.st
View file
Open in desktop
Expand Up @@ -165,7 +165,7 @@ MetacelloMCVersion >> doRecordRequiredFromArray: anArray [
{ #category : #private }
MetacelloMCVersion >> executeLoadFromArray: anArray [

| loader mcLoader |
| loader |
loader := MetacelloMCVersionSpecLoader on: self spec.
loader required: anArray.
loaderPolicy notNil ifTrue: [ loader loaderPolicy: loaderPolicy ].
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-MC/MetacelloMCVersionValidator.class.st
View file
Open in desktop
Expand Up @@ -348,7 +348,7 @@ MetacelloMCVersionValidator >> validateProjectLoad [

{ #category : #loading }
MetacelloMCVersionValidator >> validateProjectVersionLoad: versionString loads: loadList [
| issues project currentVersion version |
| issues project version |
(issues := (self validateProjectVersion: versionString) select: [ :issue | issue isError ]) notEmpty
ifTrue: [ ^ issues ].
project := self configurationClass project.
Expand Down
4 changes: 2 additions & 2 deletions src/Metacello-MC/MetacelloPackageSpec.class.st
View file
Open in desktop
Expand Up @@ -194,7 +194,7 @@ MetacelloPackageSpec >> currentPackageLoaded: loadedBlock notLoaded: notLoadedBl
"Use currentVersionInfoFor: because it involves the loader and returns versionInfo for a planned load
(atomic loaders) or currently loaded package"

| wcName vis |
| vis |
vis := anMCLoader ancestorsFor: self.
vis notNil
ifTrue: [
Expand Down Expand Up @@ -445,7 +445,7 @@ MetacelloPackageSpec >> mergeMap [
{ #category : #merging }
MetacelloPackageSpec >> mergeSpec: anotherSpec [

| newSpec map anotherPackages anotherRepositories |
| newSpec map anotherRepositories |
newSpec := super mergeSpec: anotherSpec.
map := anotherSpec mergeMap.
(anotherRepositories := map at: #repositories) notEmpty
Expand Down
8 changes: 4 additions & 4 deletions src/Metacello-ToolBox/MetacelloToolBox.class.st
View file
Open in desktop
Expand Up @@ -548,7 +548,7 @@ MetacelloToolBox class >> createVersion: targetVersionString for: configurationB

{ #category : #help }
MetacelloToolBox class >> defaultTopic: pageSelector for: aConfigurationClass [
| topic stream helpTopicClass |
| stream helpTopicClass |
(helpTopicClass := self helpTopicClass) ifNil: [^self error: 'Help system not installed'].
stream := WriteStream on: String new.
pageSelector == #helpInstallation
Expand Down Expand Up @@ -1606,7 +1606,7 @@ MetacelloToolBox >> clearVersionSpec: versionSpec fullVersionSpec: fullVersionSp

{ #category : #'api-configuration' }
MetacelloToolBox >> commitBaselineOfMethod [
| skipValidation isues |
| skipValidation |
skipValidation := false.
self methodSpec ifNil: [ ^ self ].
self methodSpec compileMethod.
Expand All @@ -1627,7 +1627,7 @@ MetacelloToolBox >> commitConfiguration: commitComment [

{ #category : #'api-configuration' }
MetacelloToolBox >> commitMethod [
| skipValidation isues |
| skipValidation |
skipValidation := false.
self methodSpec ifNil: [ ^self ].
self methodSpec compileMethod.
Expand Down Expand Up @@ -2161,7 +2161,7 @@ MetacelloToolBox >> symbolicVersionMethod: versionSymbol [

{ #category : #'api-configuration' }
MetacelloToolBox >> updateVersionMethodForVersion: inputVersionStringOrSymbol projectAttributes: projectAttributes updateProjects: updateProjects updatePackages: updatePackages versionSpecsDo: aBlock [
| constructor updatedSpecs fullVersionSpec version coll pragma imports blessing reversed addedSections visitedSpecs sourceVersionString keptSections |
| constructor updatedSpecs fullVersionSpec version coll pragma imports blessing addedSections visitedSpecs sourceVersionString keptSections |
updatedSpecs := Set new.
version := project version: inputVersionStringOrSymbol.
sourceVersionString := version versionString. "resolve symbolic version"
Expand Down