Merge pull request #20 from astares/resynch

Resycnhronize to fix #14384 in pharoproject/pharo

Hermes-Extensions/HEDuplicationModeStrategy.class.st

@@ -19,27 +19,27 @@ HEDuplicationModeStrategy class >> forOption: keyword [
 
 { #category : #'validating existence' }
 HEDuplicationModeStrategy >> doExistingClass: aClass hermesClass: aHEClass installer: installer [
-	self subclassResponsibility 
+	self subclassResponsibility
 ]
 
 { #category : #'validating existence' }
 HEDuplicationModeStrategy >> doExistingTrait: aTrait hermesTrait: aHETrait installer: installer [
-	self subclassResponsibility 
+	self subclassResponsibility
 ]
 
 { #category : #'validating existence' }
 HEDuplicationModeStrategy >> doShouldBuildMethod: aHEMethod in: installer installer: aClass original: aMethod [
-	self subclassResponsibility 
+	self subclassResponsibility
 ]
 
 { #category : #'validating existence' }
 HEDuplicationModeStrategy >> existingClass: aHEClass on: installer [
 	^ installer environment
 		at: aHEClass className
-		ifPresent: [ :aClass | 
-			self 
-				doExistingClass: aClass 
-				hermesClass: aHEClass 
+		ifPresent: [ :aClass |
+			self
+				doExistingClass: aClass
+				hermesClass: aHEClass
 				installer: installer  ]
 		ifAbsent: [ nil ]
 ]
@@ -48,10 +48,10 @@ HEDuplicationModeStrategy >> existingClass: aHEClass on: installer [
 HEDuplicationModeStrategy >> existingTrait: aHETrait on: installer [
 	^ installer environment
 		at: aHETrait traitName
-		ifPresent: [ :aTrait | 
-			self 
-				doExistingTrait: aTrait 
-				hermesTrait: aHETrait 
+		ifPresent: [ :aTrait |
+			self
+				doExistingTrait: aTrait
+				hermesTrait: aHETrait
 				installer: installer ]
 		ifAbsent: [ nil ]
 ]
@@ -60,13 +60,13 @@ HEDuplicationModeStrategy >> existingTrait: aHETrait on: installer [
 HEDuplicationModeStrategy >> shouldBuildMethod: aHEMethod in: aClass installer: installer [
 	^ aClass
 		compiledMethodAt: aHEMethod name
-		ifPresent: [ :m | 
+		ifPresent: [ :m |
 			(m isFromTrait and: [ aClass isTrait not ])
 				ifTrue: [ ^ true ].
-			self 
-				doShouldBuildMethod: aHEMethod 
-				in: installer 
-				installer: aClass 
+			self
+				doShouldBuildMethod: aHEMethod
+				in: installer
+				installer: aClass
 				original: m]
 		ifAbsent: [ true ]
 ]

Hermes-Extensions/HEExtendedInstaller.class.st

@@ -26,12 +26,12 @@ HEExtendedInstaller >> duplicationMode: anObject [
 
 { #category : #'validating existence' }
 HEExtendedInstaller >> existingClass: aHEClass [
-	^ duplicationMode existingClass: aHEClass on: self.
+	^ duplicationMode existingClass: aHEClass on: self
 ]
 
 { #category : #'validating existence' }
 HEExtendedInstaller >> existingTrait: aHETrait [
-	^ duplicationMode existingTrait: aHETrait on: self.
+	^ duplicationMode existingTrait: aHETrait on: self
 ]
 
 { #category : #accessing }
@@ -43,14 +43,14 @@ HEExtendedInstaller >> failOnUndeclared: anObject [
 HEExtendedInstaller >> forOptions: aCommandLine [
 	failOnUndeclared := (aCommandLine hasOption: 'no-fail-on-undeclared') not.
 
-	duplicationMode := HEDuplicationModeStrategy forOption: (aCommandLine optionAt: 'on-duplication' ifAbsent: [ 'fail' ]).
+	duplicationMode := HEDuplicationModeStrategy forOption: (aCommandLine optionAt: 'on-duplication' ifAbsent: [ 'fail' ])
 ]
 
 { #category : #initialization }
 HEExtendedInstaller >> initialize [
 	super initialize.
 	failOnUndeclared := true.
-	duplicationMode := HEFailOnDuplication new.
+	duplicationMode := HEFailOnDuplication new
 ]
 
 { #category : #'reporting undeclared' }
@@ -65,5 +65,5 @@ HEExtendedInstaller >> reportNewUndeclareds: newUndeclareds [
 
 { #category : #'validating existence' }
 HEExtendedInstaller >> shouldBuildMethod: aHEMethod in: aClass [
-	^ duplicationMode shouldBuildMethod: aHEMethod in: aClass installer: self.
+	^ duplicationMode shouldBuildMethod: aHEMethod in: aClass installer: self
 ]

Hermes/HEAdditionalMethodState.class.st

@@ -21,7 +21,7 @@ Class {
 
 { #category : #accessing }
 HEAdditionalMethodState class >> tag [
-	^ 1.
+	^ 1
 ]
 
 { #category : #converting }
@@ -40,8 +40,7 @@ HEAdditionalMethodState >> asLiteralIn: env [
 HEAdditionalMethodState >> doReadFrom: aReader [
 	method := HEExportedLiteral readFrom: aReader.
 	selector := HEExportedLiteral readFrom: aReader.
-	value := HEExportedLiteral readFrom: aReader.
-
+	value := HEExportedLiteral readFrom: aReader
 ]
 
 { #category : #accessing }

Hermes/HEArray.class.st

@@ -19,7 +19,7 @@ Class {
 
 { #category : #accessing }
 HEArray class >> tag [
-	^ 2.
+	^ 2
 ]
 
 { #category : #converting }
@@ -30,12 +30,12 @@ HEArray >> asLiteralIn: env [
 
 { #category : #reading }
 HEArray >> doReadFrom: aReader [
-	| size | 
+	| size |
 	"The size of the array is stored as a 32bits integer. Before any of the elements"
 	size := aReader readInt32.
 	value := Array new:size.
-	
-	1 to:size do:[:idx | value at:idx put: (HEExportedLiteral readFrom: aReader)].
+
+	1 to:size do:[:idx | value at:idx put: (HEExportedLiteral readFrom: aReader)]
 ]
 
 { #category : #accessing }

Hermes/HEAssociation.class.st

@@ -26,12 +26,11 @@ HEAssociation >> asLiteralIn: env [
 { #category : #reading }
 HEAssociation >> doReadFrom: aReader [
 	key := HEExportedLiteral readFrom: aReader.
-	value := HEExportedLiteral readFrom: aReader.
-
+	value := HEExportedLiteral readFrom: aReader
 ]
 
 { #category : #accessing }
 HEAssociation >> value: anAssociation [
 	value := anAssociation value asExportedLiteral.
-	key := anAssociation key asExportedLiteral.
+	key := anAssociation key asExportedLiteral
 ]

Hermes/HEBinaryReader.class.st

@@ -24,7 +24,7 @@ Class {
 
 { #category : #initialization }
 HEBinaryReader >> close [
-	self stream close.
+	self stream close
 ]
 
 { #category : #sizes }
@@ -40,7 +40,7 @@ HEBinaryReader >> readByte [
 { #category : #reading }
 HEBinaryReader >> readByteArray [
 	| byteArray size |
-	size := self readInt32. 
+	size := self readInt32.
 	byteArray := stream next: size.
 	^ byteArray
 ]
@@ -52,7 +52,7 @@ HEBinaryReader >> readByteString [
 
 { #category : #reading }
 HEBinaryReader >> readByteSymbol [
-	^ self readByteString asSymbol 
+	^ self readByteString asSymbol
 ]
 
 { #category : #reading }

Hermes/HEByteArray.class.st

@@ -21,5 +21,5 @@ HEByteArray >> asLiteralIn: env [
 
 { #category : #reading }
 HEByteArray >> doReadFrom: aReader [
-	value := aReader readByteArray.
+	value := aReader readByteArray
 ]

Hermes/HEByteString.class.st

@@ -11,7 +11,7 @@ Class {
 
 { #category : #accessing }
 HEByteString class >> tag [
-	^ 4.
+	^ 4
 ]
 
 { #category : #converting }
@@ -22,10 +22,10 @@ HEByteString >> asLiteralIn: env [
 { #category : #reading }
 HEByteString >> doConvertValue: aValue [
 	"My subclasses are able to do something else to convert the readed value"
-	^ aValue.
+	^ aValue
 ]
 
 { #category : #reading }
 HEByteString >> doReadFrom: aReader [
-	value := self doConvertValue:(aReader readByteString).
+	value := self doConvertValue:(aReader readByteString)
 ]

Hermes/HECharacter.class.st

@@ -12,7 +12,7 @@ Class {
 
 { #category : #accessing }
 HECharacter class >> tag [
-	^ 5.
+	^ 5
 ]
 
 { #category : #converting }
@@ -22,5 +22,5 @@ HECharacter >> asLiteralIn: env [
 
 { #category : #accessing }
 HECharacter >> value: aValue [
-	value := aValue asString.
+	value := aValue asString
 ]

Hermes/HEClass.class.st

@@ -97,7 +97,7 @@ HEClass >> layoutClass: anObject [
 
 { #category : #accessing }
 HEClass >> name [
-	
+
 	^ self className
 ]
 

Hermes/HEClassTrait.class.st

@@ -23,5 +23,5 @@ HEClassTrait >> asLiteralIn: env [
 
 { #category : #accessing }
 HEClassTrait >> value: aClassTrait [
-	value := aClassTrait instanceSide name.
+	value := aClassTrait instanceSide name
 ]

Hermes/HEClassVariable.class.st

@@ -13,16 +13,16 @@ Class {
 
 { #category : #accessing }
 HEClassVariable class >> tag [
-	^ 6.
+	^ 6
 ]
 
 { #category : #converting }
 HEClassVariable >> asLiteralIn: env [
 	"I ask the binding to the class that is currently being deserialized"
-	^ env newClass bindingOf: value 
+	^ env newClass bindingOf: value
 ]
 
 { #category : #accessing }
 HEClassVariable >> value: aClassVariable [
-	value := aClassVariable name.
+	value := aClassVariable name
 ]

Hermes/HECompiledBlock.class.st

@@ -22,12 +22,12 @@ HECompiledBlock class >> tag [
 HECompiledBlock >> asLiteralIn: anEnvironment [
 
 	| containingBlockOrMethod newBlock literalSpace previousBlock|
-	
+
 	previousBlock := anEnvironment newBlock.
 	containingBlockOrMethod := previousBlock ifNil: [ anEnvironment newMethod ].
-	
+
 	newBlock := CompiledBlock newMethod: bytecode size header: (self headerFor: anEnvironment).
-	
+
 	anEnvironment newBlock: newBlock.
 
 	literals
@@ -66,7 +66,7 @@ HECompiledBlock >> headerFor: anEnvironment [
 	| encoderClass|
 	"When a method is deserialized its header should be recalculated"
 	encoderClass := anEnvironment classNamed: encoderClassName.
-	
+
 	^ (CompiledMethod headerFlagForEncoder: encoderClass) + (numArgs bitShift: 24) + (numTemps bitShift: 18) + literals size + (hasPrimitive bitShift: 16)
 ]
 

Hermes/HEConstantBlock.class.st

@@ -30,7 +30,7 @@ HEConstantBlock >> doReadFrom: aReader [
 
 	numArgs := aReader readUInt32.
 	literal := HEExportedLiteral readFrom: aReader.
-	compiledBlock := HEExportedLiteral readFrom: aReader.
+	compiledBlock := HEExportedLiteral readFrom: aReader
 ]
 
 { #category : #comparing }

Hermes/HEExportedLiteral.class.st

@@ -58,7 +58,7 @@ HEExportedLiteral >> asLiteralIn: anEnvironment [
 { #category : #reading }
 HEExportedLiteral >> doReadFrom: aReader [
 	"Main template method to read the instance from the reader stream"
-	self subclassResponsibility.
+	self subclassResponsibility
 ]
 
 { #category : #accessing }

Hermes/HEExportedMetaclass.class.st

@@ -23,5 +23,5 @@ HEExportedMetaclass >> asLiteralIn: env [
 
 { #category : #accessing }
 HEExportedMetaclass >> value: aMetaclass [
-	value := aMetaclass instanceSide name.
+	value := aMetaclass instanceSide name
 ]

Hermes/HEFloat.class.st

@@ -14,12 +14,12 @@ Class {
 
 { #category : #accessing }
 HEFloat class >> tag [
-	^ 3.
+	^ 3
 ]
 
 { #category : #converting }
 HEFloat >> asLiteralIn: env [
-	^ value.
+	^ value
 ]
 
 { #category : #reading }
@@ -28,7 +28,7 @@ HEFloat >> doReadFrom: aReader [
 	originalValue := BoxedFloat64 new.
 	originalValue at:1 put: (aReader readUInt32).
 	originalValue at:2 put: (aReader readUInt32).
-	
+
 	"Force the conversion to SmallFloat64 or BoxedFloat64"
-	value := originalValue - 0.0.
+	value := originalValue - 0.0
 ]

Hermes/HEFraction.class.st

@@ -9,7 +9,7 @@ Class {
 }
 
 { #category : #accessing }
-HEFraction class >> tag [ 
+HEFraction class >> tag [
 	^ 24
 ]
 
@@ -23,6 +23,6 @@ HEFraction >> doReadFrom: aReader [
 	| denominator numerator |
 	numerator := HEExportedLiteral readFrom: aReader.
 	denominator := HEExportedLiteral readFrom: aReader.
-	
-	value := Fraction numerator: numerator value denominator: denominator value.
+
+	value := Fraction numerator: numerator value denominator: denominator value
 ]

Hermes/HEGlobalVariable.class.st

@@ -14,20 +14,20 @@ Class {
 
 { #category : #accessing }
 HEGlobalVariable class >> tag [
-	^ 7.
+	^ 7
 ]
 
 { #category : #converting }
 HEGlobalVariable >> asLiteralIn: env [
 	| bind |
 	bind := env newClass bindingOf: value.
-	
+
 	bind ifNotNil: [ ^ bind ].
-	
+
 	^UndeclaredVariable registeredWithName: value
 ]
 
 { #category : #accessing }
 HEGlobalVariable >> value: aClassVariable [
-	value := aClassVariable name.
+	value := aClassVariable name
 ]