py: make == and != complain if comparing the same type with no __eq__ method

ncw · ncw · commit 40a252884cf0 · 2015-06-29T21:18:00.000+01:00
diff --git a/py/arithmetic.go b/py/arithmetic.go
@@ -863,7 +863,11 @@ func Eq(a Object, b Object) (Object, error) {
 		}
 	}
 
-	return False, nil
+	if a.Type() != b.Type() {
+		return False, nil
+	}
+
+	return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for ==: '%s' and '%s'", a.Type().Name, b.Type().Name)
 }
 
 // Ne two python objects returning a boolean result
@@ -892,5 +896,9 @@ func Ne(a Object, b Object) (Object, error) {
 		}
 	}
 
-	return True, nil
+	if a.Type() != b.Type() {
+		return True, nil
+	}
+
+	return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for !=: '%s' and '%s'", a.Type().Name, b.Type().Name)
 }
diff --git a/py/gen.go b/py/gen.go
@@ -194,7 +194,12 @@ func {{.Title}}(a Object, b Object) (Object, error) {
 		}
 	}
 
-	return {{ if .FailReturn}}{{ .FailReturn }}, nil{{ else }}nil, ExceptionNewf(TypeError, "unsupported operand type(s) for {{.Operator}}: '%s' and '%s'", a.Type().Name, b.Type().Name){{ end }}
+{{ if .FailReturn}}
+if a.Type() != b.Type() {
+	return {{ .FailReturn }}, nil
+}
+{{ end }}
+	return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for {{.Operator}}: '%s' and '%s'", a.Type().Name, b.Type().Name)
 }
 {{ end }}
 `

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,11 @@ func Eq(a Object, b Object) (Object, error) {`
`863`	`863`	`}`
`864`	`864`	`}`
`865`	`865`
`866`		`- return False, nil`
	`866`	`+ if a.Type() != b.Type() {`
	`867`	`+ return False, nil`
	`868`	`+ }`
	`869`	`+`
	`870`	`+ return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for ==: '%s' and '%s'", a.Type().Name, b.Type().Name)`
`867`	`871`	`}`
`868`	`872`
`869`	`873`	`// Ne two python objects returning a boolean result`
`@@ -892,5 +896,9 @@ func Ne(a Object, b Object) (Object, error) {`
`892`	`896`	`}`
`893`	`897`	`}`
`894`	`898`
`895`		`- return True, nil`
	`899`	`+ if a.Type() != b.Type() {`
	`900`	`+ return True, nil`
	`901`	`+ }`
	`902`	`+`
	`903`	`+ return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for !=: '%s' and '%s'", a.Type().Name, b.Type().Name)`
`896`	`904`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,12 @@ func {{.Title}}(a Object, b Object) (Object, error) {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`- return {{ if .FailReturn}}{{ .FailReturn }}, nil{{ else }}nil, ExceptionNewf(TypeError, "unsupported operand type(s) for {{.Operator}}: '%s' and '%s'", a.Type().Name, b.Type().Name){{ end }}`
	`197`	`+{{ if .FailReturn}}`
	`198`	`+if a.Type() != b.Type() {`
	`199`	`+ return {{ .FailReturn }}, nil`
	`200`	`+}`
	`201`	`+{{ end }}`
	`202`	`+ return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for {{.Operator}}: '%s' and '%s'", a.Type().Name, b.Type().Name)`
`198`	`203`	`}`
`199`	`204`	`{{ end }}`
`200`	`205`	`