Make NewBool and use it to simplify code

ncw · ncw · commit 7c4b61a543c2 · 2013-11-28T23:10:08.000Z
diff --git a/py/bool.go b/py/bool.go
@@ -16,6 +16,14 @@ func (s Bool) Type() *Type{
 	return BoolType
 }
 
+// Make a new bool - returns the canonical True and False values
+func NewBool(t bool) Bool{
+	if t{
+		return True
+	}
+	return False
+}
+
 func (a Bool) M__bool__() Object{
 	return a
 }
diff --git a/py/complex.go b/py/complex.go
@@ -224,22 +224,14 @@ func (a Complex) M__le__(other Object) Object{
 
 func (a Complex) M__eq__(other Object) Object{
 	if b, ok := convertToComplex(other); ok{
-		if a == b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a == b)
 	}
 	return NotImplemented
 }
 
 func (a Complex) M__ne__(other Object) Object{
 	if b, ok := convertToComplex(other); ok{
-		if a != b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a != b)
 	}
 	return NotImplemented
 }
diff --git a/py/float.go b/py/float.go
@@ -195,10 +195,7 @@ func (a Float) M__ipow__(other, modulus Object) Object{
 }
 
 func (a Float) M__bool__() Object{
-	if a == 0{
-		return False
-	}
-	return True
+	return NewBool(a != 0)
 }
 
 func (a Float) M__int__() Object{
@@ -229,66 +226,42 @@ func (a Float) M__round__(digitsObj Object) Object{
 
 func (a Float) M__lt__(other Object) Object{
 	if b, ok := convertToFloat(other); ok{
-		if a < b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a < b)
 	}
 	return NotImplemented
 }
 
 func (a Float) M__le__(other Object) Object{
 	if b, ok := convertToFloat(other); ok{
-		if a <= b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a <= b)
 	}
 	return NotImplemented
 }
 
 func (a Float) M__eq__(other Object) Object{
 	if b, ok := convertToFloat(other); ok{
-		if a == b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a == b)
 	}
 	return NotImplemented
 }
 
 func (a Float) M__ne__(other Object) Object{
 	if b, ok := convertToFloat(other); ok{
-		if a != b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a != b)
 	}
 	return NotImplemented
 }
 
 func (a Float) M__gt__(other Object) Object{
 	if b, ok := convertToFloat(other); ok{
-		if a > b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a > b)
 	}
 	return NotImplemented
 }
 
 func (a Float) M__ge__(other Object) Object{
 	if b, ok := convertToFloat(other); ok{
-		if a >= b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a >= b)
 	}
 	return NotImplemented
 }
diff --git a/py/int.go b/py/int.go
@@ -307,10 +307,7 @@ func (a Int) M__ior__(other Object) Object{
 }
 
 func (a Int) M__bool__() Object{
-	if a == 0{
-		return False
-	}
-	return True
+	return NewBool(a != 0)
 }
 
 func (a Int) M__index__() Int{
@@ -343,66 +340,42 @@ func (a Int) M__round__(digits Object) Object{
 
 func (a Int) M__lt__(other Object) Object{
 	if b, ok := convertToInt(other); ok{
-		if a < b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a < b)
 	}
 	return NotImplemented
 }
 
 func (a Int) M__le__(other Object) Object{
 	if b, ok := convertToInt(other); ok{
-		if a <= b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a <= b)
 	}
 	return NotImplemented
 }
 
 func (a Int) M__eq__(other Object) Object{
 	if b, ok := convertToInt(other); ok{
-		if a == b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a == b)
 	}
 	return NotImplemented
 }
 
 func (a Int) M__ne__(other Object) Object{
 	if b, ok := convertToInt(other); ok{
-		if a != b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a != b)
 	}
 	return NotImplemented
 }
 
 func (a Int) M__gt__(other Object) Object{
 	if b, ok := convertToInt(other); ok{
-		if a > b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a > b)
 	}
 	return NotImplemented
 }
 
 func (a Int) M__ge__(other Object) Object{
 	if b, ok := convertToInt(other); ok{
-		if a >= b{
-			return True
-		} else{
-			return False
-		}
+		return NewBool(a >= b)
 	}
 	return NotImplemented
 }
diff --git a/py/list.go b/py/list.go
@@ -26,10 +26,7 @@ func (t List) M__len__() Object{
 }
 
 func (t List) M__bool__() Object{
-	if len(t) > 0{
-		return True
-	}
-	return False
+	return NewBool(len(t) > 0)
 }
 
 func (t List) M__iter__() Object{
diff --git a/py/tuple.go b/py/tuple.go
@@ -24,10 +24,7 @@ func (t Tuple) M__len__() Object{
 }
 
 func (t Tuple) M__bool__() Object{
-	if len(t) > 0{
-		return True
-	}
-	return False
+	return NewBool(len(t) > 0)
 }
 
 func (t Tuple) M__iter__() Object{

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,14 @@ func (s Bool) Type() *Type{`
`16`	`16`	`returnBoolType`
`17`	`17`	`}`
`18`	`18`
	`19`	`+// Make a new bool - returns the canonical True and False values`
	`20`	`+funcNewBool(tbool) Bool{`
	`21`	`+ift{`
	`22`	`+returnTrue`
	`23`	`+ }`
	`24`	`+returnFalse`
	`25`	`+}`
	`26`	`+`
`19`	`27`	`func (aBool) M__bool__() Object{`
`20`	`28`	`returna`
`21`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,22 +224,14 @@ func (a Complex) M__le__(other Object) Object{`
`224`	`224`
`225`	`225`	`func (aComplex) M__eq__(otherObject) Object{`
`226`	`226`	`ifb, ok:=convertToComplex(other); ok{`
`227`		`-ifa==b{`
`228`		`-returnTrue`
`229`		`- } else{`
`230`		`-returnFalse`
`231`		`- }`
	`227`	`+returnNewBool(a==b)`
`232`	`228`	`}`
`233`	`229`	`returnNotImplemented`
`234`	`230`	`}`
`235`	`231`
`236`	`232`	`func (aComplex) M__ne__(otherObject) Object{`
`237`	`233`	`ifb, ok:=convertToComplex(other); ok{`
`238`		`-ifa!=b{`
`239`		`-returnTrue`
`240`		`- } else{`
`241`		`-returnFalse`
`242`		`- }`
	`234`	`+returnNewBool(a!=b)`
`243`	`235`	`}`
`244`	`236`	`returnNotImplemented`
`245`	`237`	`}`
-Original file line number
+Diff line change
+}
 func (aFloat) M__bool__() Object{
 -ifa==0{
 -returnFalse
 - }
 -returnTrue
 +returnNewBool(a!=0)
+}
 func (aFloat) M__int__() Object{
 func (aFloat) M__lt__(otherObject) Object{
 ifb, ok:=convertToFloat(other); ok{
 -ifa<b{
 -returnTrue
 - } else{
 -returnFalse
 - }
 +returnNewBool(a<b)
+ }
 returnNotImplemented
+}
 func (aFloat) M__le__(otherObject) Object{
 ifb, ok:=convertToFloat(other); ok{
 -ifa<=b{
 -returnTrue
 - } else{
 -returnFalse
 - }
 +returnNewBool(a<=b)
+ }
 returnNotImplemented
+}
 func (aFloat) M__eq__(otherObject) Object{
 ifb, ok:=convertToFloat(other); ok{
 -ifa==b{
 -returnTrue
 - } else{
 -returnFalse
 - }
 +returnNewBool(a==b)
+ }
 returnNotImplemented
+}
 func (aFloat) M__ne__(otherObject) Object{
 ifb, ok:=convertToFloat(other); ok{
 -ifa!=b{
 -returnTrue
 - } else{
 -returnFalse
 - }
 +returnNewBool(a!=b)
+ }
 returnNotImplemented
+}
 func (aFloat) M__gt__(otherObject) Object{
 ifb, ok:=convertToFloat(other); ok{
 -ifa>b{
 -returnTrue
 - } else{
 -returnFalse
 - }
 +returnNewBool(a>b)
+ }
 returnNotImplemented
+}
 func (aFloat) M__ge__(otherObject) Object{
 ifb, ok:=convertToFloat(other); ok{
 -ifa>=b{
 -returnTrue
 - } else{
 -returnFalse
 - }
 +returnNewBool(a>=b)
+ }
 returnNotImplemented
+}
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,7 @@ func (t List) M__len__() Object{`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (tList) M__bool__() Object{`
`29`		`-iflen(t) >0{`
`30`		`-returnTrue`
`31`		`- }`
`32`		`-returnFalse`
	`29`	`+returnNewBool(len(t) >0)`
`33`	`30`	`}`
`34`	`31`
`35`	`32`	`func (tList) M__iter__() Object{`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,7 @@ func (t Tuple) M__len__() Object{`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func (tTuple) M__bool__() Object{`
`27`		`-iflen(t) >0{`
`28`		`-returnTrue`
`29`		`- }`
`30`		`-returnFalse`
	`27`	`+returnNewBool(len(t) >0)`
`31`	`28`	`}`
`32`	`29`
`33`	`30`	`func (tTuple) M__iter__() Object{`