Extract returns from conditionals

Author: jecisc

src/ExtendedNumberParser/ExtendedNumberParser.class.st

@@ -10,7 +10,7 @@ An ExtendedNumberParser is extending Squeak number syntax with these rules
 Class {
 	#name : #ExtendedNumberParser,
 	#superclass : #NumberParser,
-	#category : 'ExtendedNumberParser'
+	#category : #ExtendedNumberParser
 }
 
 { #category : #accessing }
@@ -76,43 +76,39 @@ ExtendedNumberParser >> nextFraction [
 ExtendedNumberParser >> nextNumber [
 	"main method for reading a number.
 	This one can read Float Integer and ScaledDecimal"
-	
+
 	| numberOfTrailingZeroInIntegerPart |
 	base := 10.
 	neg := self peekSignIsMinus.
 	integerPart := self nextUnsignedIntegerOrNilBase: base.
-	integerPart ifNil: [(sourceStream peekFor: $.)
-		ifTrue: [
-			"Try .1 syntax"
-			^self readNumberWithoutIntegerPart]
-		ifFalse: [
-			"This is not a regular number beginning with a digit
+	integerPart ifNil: [
+		^ (sourceStream peekFor: $.)
+			  ifTrue: [ "Try .1 syntax" self readNumberWithoutIntegerPart ]
+			  ifFalse: [ "This is not a regular number beginning with a digit
 			It is time to check for exceptional condition NaN and Infinity"
-			^self readNamedFloatOrFail]].
+				  self readNamedFloatOrFail ] ].
 	numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero.
-	(sourceStream peekFor: $r)
-		ifTrue: ["<base>r<integer>"
-			| oldNeg pos |
-			pos := sourceStream position.
-			(base := integerPart) < 2
-				ifTrue: ["A radix currently need to be greater than 1, ungobble the r and return the integer part"
-					sourceStream skip: -1.
-					^neg
-						ifTrue: [base negated]
-						ifFalse: [base]].
-			oldNeg := neg.
-			self peekSignIsMinus ifTrue: [neg := neg not].
-			integerPart := self nextUnsignedIntegerOrNilBase: base.
-			integerPart ifNil: [
-				(sourceStream peekFor: $.) ifTrue: [self readNumberWithoutIntegerPartOrNil ifNotNil: [:aNumber | ^aNumber]].
-				sourceStream position: pos.
-					^oldNeg
-						ifTrue: [base negated]
-						ifFalse: [base]].
-			numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero].
+	(sourceStream peekFor: $r) ifTrue: [ "<base>r<integer>"
+		| oldNeg pos |
+		pos := sourceStream position.
+		(base := integerPart) < 2 ifTrue: [ "A radix currently need to be greater than 1, ungobble the r and return the integer part"
+			sourceStream skip: -1.
+			^ neg
+				  ifTrue: [ base negated ]
+				  ifFalse: [ base ] ].
+		oldNeg := neg.
+		self peekSignIsMinus ifTrue: [ neg := neg not ].
+		integerPart := self nextUnsignedIntegerOrNilBase: base.
+		integerPart ifNil: [
+			(sourceStream peekFor: $.) ifTrue: [ self readNumberWithoutIntegerPartOrNil ifNotNil: [ :aNumber | ^ aNumber ] ].
+			sourceStream position: pos.
+			^ oldNeg
+				  ifTrue: [ base negated ]
+				  ifFalse: [ base ] ].
+		numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero ].
 	^ (sourceStream peekFor: $.)
-		ifTrue: [self readNumberWithFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart]
-		ifFalse: [self makeIntegerOrScaledInteger]
+		  ifTrue: [ self readNumberWithFractionPartNumberOfTrailingZeroInIntegerPart: numberOfTrailingZeroInIntegerPart ]
+		  ifFalse: [ self makeIntegerOrScaledInteger ]
 ]
 
 { #category : #'parsing-private' }

src/Math-ArbitraryPrecisionFloat/PMArbitraryPrecisionFloat.class.st

@@ -28,7 +28,7 @@ Class {
 		'mantissa',
 		'biasedExponent'
 	],
-	#category : 'Math-ArbitraryPrecisionFloat'
+	#category : #'Math-ArbitraryPrecisionFloat'
 }
 
 { #category : #examples }
@@ -129,33 +129,38 @@ PMArbitraryPrecisionFloat >> / aNumber [
 
 { #category : #comparing }
 PMArbitraryPrecisionFloat >> < aNumber [
-	aNumber class = self class ifTrue:
-		[self negative == aNumber negative
-			ifTrue: [self negative
-						ifTrue: [^ (self digitCompare: aNumber) > 0]
-						ifFalse: [^ (self digitCompare: aNumber) < 0]]
-			ifFalse: [^ self negative]].
+
+	aNumber class = self class ifTrue: [
+		^ self negative == aNumber negative
+			  ifTrue: [
+				  self negative
+					  ifTrue: [ (self digitCompare: aNumber) > 0 ]
+					  ifFalse: [ (self digitCompare: aNumber) < 0 ] ]
+			  ifFalse: [ self negative ] ].
 	^ aNumber adaptToArbitraryPrecisionFloat: self andCompare: #<
 ]
 
 { #category : #comparing }
 PMArbitraryPrecisionFloat >> = aNumber [
-	aNumber isNumber ifFalse: [^ false].
-	aNumber class = self class ifTrue:
-		[aNumber negative == self negative
-			ifTrue: [^ (self digitCompare: aNumber) = 0]
-			ifFalse: [^ false]].
+
+	aNumber isNumber ifFalse: [ ^ false ].
+	aNumber class = self class ifTrue: [
+		^ aNumber negative == self negative
+			  ifTrue: [ (self digitCompare: aNumber) = 0 ]
+			  ifFalse: [ false ] ].
 	^ aNumber adaptToArbitraryPrecisionFloat: self andCompare: #=
 ]
 
 { #category : #comparing }
 PMArbitraryPrecisionFloat >> > aNumber [
-	aNumber class = self class ifTrue:
-		[self negative == aNumber negative
-			ifTrue: [self negative
-						ifTrue: [^(self digitCompare: aNumber) < 0]
-						ifFalse: [^(self digitCompare: aNumber) > 0]]
-			ifFalse: [^ aNumber negative]].
+
+	aNumber class = self class ifTrue: [
+		^ self negative == aNumber negative
+			  ifTrue: [
+				  self negative
+					  ifTrue: [ (self digitCompare: aNumber) < 0 ]
+					  ifFalse: [ (self digitCompare: aNumber) > 0 ] ]
+			  ifFalse: [ aNumber negative ] ].
 	^ aNumber adaptToArbitraryPrecisionFloat: self andCompare: #>
 ]
 
@@ -612,21 +617,20 @@ PMArbitraryPrecisionFloat >> decimalPrecision [
 ]
 
 { #category : #private }
-PMArbitraryPrecisionFloat >> digitCompare: b [ 
+PMArbitraryPrecisionFloat >> digitCompare: b [
 	"both are positive or negative.
 	answer +1 if i am of greater magnitude, -1 if i am of smaller magnitude, 0 if equal magnitude"
-	
+
 	| compare |
-	self isZero
-		ifTrue: [b isZero
-				ifTrue: [^ 0]
-				ifFalse: [^ -1]].
-	b isZero
-		ifTrue: [^ 1].
+	self isZero ifTrue: [
+		^ b isZero
+			  ifTrue: [ 0 ]
+			  ifFalse: [ -1 ] ].
+	b isZero ifTrue: [ ^ 1 ].
 	compare := (self exponent - b exponent) sign.
 	^ compare = 0
-		ifTrue: [(self abs - b abs) sign]
-		ifFalse: [compare]
+		  ifTrue: [ (self abs - b abs) sign ]
+		  ifFalse: [ compare ]
 ]
 
 { #category : #'mathematical functions' }

src/Math-Complex/PMComplexNumber.class.st

@@ -124,52 +124,52 @@ PMComplexNumber class >> zero [
 { #category : #arithmetic }
 PMComplexNumber >> * anObject [
 	"Answer the result of multiplying the receiver by aNumber."
+
 	| a b c d newReal newImaginary |
-	anObject isComplexNumber
-		ifTrue:
-			[a := self real.
-			b := self imaginary.
-			c := anObject real.
-			d := anObject imaginary.
-			newReal := (a * c) - (b * d).
-			newImaginary := (a * d) + (b * c).
-			^ PMComplexNumber real: newReal imaginary: newImaginary]
-		ifFalse:
-			[^ anObject adaptToComplex: self andSend: #*]
+	^ anObject isComplexNumber
+		  ifTrue: [
+			  a := self real.
+			  b := self imaginary.
+			  c := anObject real.
+			  d := anObject imaginary.
+			  newReal := a * c - (b * d).
+			  newImaginary := a * d + (b * c).
+			  PMComplexNumber real: newReal imaginary: newImaginary ]
+		  ifFalse: [ anObject adaptToComplex: self andSend: #* ]
 ]
 
 { #category : #arithmetic }
 PMComplexNumber >> + anObject [
 	"Answer the sum of the receiver and aNumber."
+
 	| a b c d newReal newImaginary |
-	anObject isComplexNumber
-		ifTrue:
-			[a := self real.
-			b := self imaginary.
-			c := anObject real.
-			d := anObject imaginary.
-			newReal := a + c.
-			newImaginary := b + d.
-			^ PMComplexNumber real: newReal imaginary: newImaginary]
-		ifFalse:
-			[^ anObject adaptToComplex: self andSend: #+]
+	^ anObject isComplexNumber
+		  ifTrue: [
+			  a := self real.
+			  b := self imaginary.
+			  c := anObject real.
+			  d := anObject imaginary.
+			  newReal := a + c.
+			  newImaginary := b + d.
+			  PMComplexNumber real: newReal imaginary: newImaginary ]
+		  ifFalse: [ anObject adaptToComplex: self andSend: #+ ]
 ]
 
 { #category : #arithmetic }
 PMComplexNumber >> - anObject [
 	"Answer the difference between the receiver and aNumber."
+
 	| a b c d newReal newImaginary |
-	anObject isComplexNumber
-		ifTrue:
-			[a := self real.
-			b := self imaginary.
-			c := anObject real.
-			d := anObject imaginary.
-			newReal := a - c.
-			newImaginary := b - d.
-			^ PMComplexNumber real: newReal imaginary: newImaginary]
-		ifFalse:
-			[^ anObject adaptToComplex: self andSend: #-]
+	^ anObject isComplexNumber
+		  ifTrue: [
+			  a := self real.
+			  b := self imaginary.
+			  c := anObject real.
+			  d := anObject imaginary.
+			  newReal := a - c.
+			  newImaginary := b - d.
+			  PMComplexNumber real: newReal imaginary: newImaginary ]
+		  ifFalse: [ anObject adaptToComplex: self andSend: #- ]
 ]
 
 { #category : #arithmetic }
@@ -189,10 +189,11 @@ PMComplexNumber >> / aNumber [
 
 { #category : #comparing }
 PMComplexNumber >> = anObject [
-	anObject isNumber ifFalse: [^false].
-	anObject isComplexNumber
-		ifTrue: [^ (real = anObject real) & (imaginary = anObject imaginary)]
-		ifFalse: [^ anObject adaptToComplex: self andSend: #=]
+
+	anObject isNumber ifFalse: [ ^ false ].
+	^ anObject isComplexNumber
+		  ifTrue: [ real = anObject real & (imaginary = anObject imaginary) ]
+		  ifFalse: [ anObject adaptToComplex: self andSend: #= ]
 ]
 
 { #category : #arithmetic }
@@ -262,16 +263,17 @@ PMComplexNumber >> arCosh [
 	^self arcCos i
 	This implementation provides an answer with a positive real part.
 	It also avoids creating intermediate Complex."
-	
+
 	| x y tmp sh2x shx delta ch2x chx |
-	imaginary = 0 ifTrue: [real abs > 1
-			ifTrue: 
-				[y := real < 0
-					ifTrue: [Float pi]
-					ifFalse: [0].
-				x := real abs arCosh.
-				^self class real: x imaginary: y]
-			ifFalse: [^self class real: 0 imaginary: real arcCos]].
+	imaginary = 0 ifTrue: [
+		^ real abs > 1
+			  ifTrue: [
+				  y := real < 0
+					       ifTrue: [ Float pi ]
+					       ifFalse: [ 0 ].
+				  x := real abs arCosh.
+				  self class real: x imaginary: y ]
+			  ifFalse: [ self class real: 0 imaginary: real arcCos ] ].
 	tmp := self squaredNorm - 1 / 2.
 	delta := tmp squared + imaginary squared.
 	sh2x := tmp + delta sqrt.
@@ -280,7 +282,7 @@ PMComplexNumber >> arCosh [
 	chx := ch2x sqrt.
 	x := shx arSinh.
 	y := imaginary copySignTo: (real / chx) arcCos.
-	^self class real: x imaginary: y
+	^ self class real: x imaginary: y
 ]
 
 { #category : #'mathematical functions' }
@@ -315,14 +317,15 @@ PMComplexNumber >> arcCos [
 	This is the inverse function of cos."
 
 	| x y tmp sh2y shy delta ch2y chy |
-	imaginary = 0 ifTrue: [real abs > 1
-			ifTrue: 
-				[x := real < 0
-					ifTrue: [Float pi]
-					ifFalse: [0].
-				y := real copySignTo: real abs arCosh.
-				^self class real: x imaginary: y]
-			ifFalse: [^self class real: real arcCos imaginary: 0]].
+	imaginary = 0 ifTrue: [
+		^ real abs > 1
+			  ifTrue: [
+				  x := real < 0
+					       ifTrue: [ Float pi ]
+					       ifFalse: [ 0 ].
+				  y := real copySignTo: real abs arCosh.
+				  self class real: x imaginary: y ]
+			  ifFalse: [ self class real: real arcCos imaginary: 0 ] ].
 	tmp := self squaredNorm - 1 / 2.
 	delta := tmp squared + imaginary squared.
 	sh2y := tmp + delta sqrt.
@@ -331,7 +334,7 @@ PMComplexNumber >> arcCos [
 	chy := ch2y sqrt.
 	y := imaginary copySignTo: shy arSinh.
 	x := (real / chy) arcCos.
-	^self class real: x imaginary: y negated
+	^ self class real: x imaginary: y negated
 ]
 
 { #category : #'mathematical functions' }
@@ -340,23 +343,22 @@ PMComplexNumber >> arcSin [
 	This is the inverse function of sin."
 
 	| x y tmp delta sh2y shy ch2y chy |
-	imaginary = 0 
-		ifTrue: 
-			[real abs > 1 
-				ifTrue: 
-					[x := Float pi / 2 * real sign.
-					y := (real copySignTo: real abs arCosh) negated.
-					^self class real: x imaginary: y]
-				ifFalse: [^self class real: real arcSin imaginary: 0]].
-	tmp := (self squaredNorm - 1) / 2.
+	imaginary = 0 ifTrue: [
+		^ real abs > 1
+			  ifTrue: [
+				  x := Float pi / 2 * real sign.
+				  y := (real copySignTo: real abs arCosh) negated.
+				  self class real: x imaginary: y ]
+			  ifFalse: [ self class real: real arcSin imaginary: 0 ] ].
+	tmp := self squaredNorm - 1 / 2.
 	delta := tmp squared + imaginary squared.
 	sh2y := tmp + delta sqrt.
 	shy := sh2y sqrt.
 	ch2y := 1 + sh2y.
 	chy := ch2y sqrt.
 	y := imaginary copySignTo: shy arSinh.
 	x := (real / chy) arcSin.
-	^self class real: x imaginary: y
+	^ self class real: x imaginary: y
 ]
 
 { #category : #'mathematical functions' }
@@ -686,10 +688,9 @@ PMComplexNumber >> reciprocal [
 	"Answer 1 divided by the receiver. Create an error notification if the 
 	receiver is 0."
 
-	self = 0
-		ifTrue: [^ (ZeroDivide dividend: self) signal]
-		ifFalse: [^1 / self]
-		
+	^ self = 0
+		  ifTrue: [ (ZeroDivide dividend: self) signal ]
+		  ifFalse: [ 1 / self ]
 ]
 
 { #category : #testing }