py: fix Eq and Ne

ncw · ncw · commit d95eafbd9ef1 · 2015-06-11T20:41:10.000+01:00
diff --git a/py/arithmetic.go b/py/arithmetic.go
@@ -863,7 +863,7 @@ func Eq(a Object, b Object) (Object, error) {
 		}
 	}
 
-	return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for ==: '%s' and '%s'", a.Type().Name, b.Type().Name)
+	return False, nil
 }
 
 // Ne two python objects returning a boolean result
@@ -892,5 +892,5 @@ func Ne(a Object, b Object) (Object, error) {
 		}
 	}
 
-	return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for !=: '%s' and '%s'", a.Type().Name, b.Type().Name)
+	return True, nil
 }
diff --git a/py/gen.go b/py/gen.go
@@ -22,6 +22,7 @@ type Ops []struct {
 	NoInplace           bool
 	Reversed            string
 	Conversion          string
+	FailReturn          string
 }
 
 type Data struct {
@@ -61,8 +62,8 @@ var data = Data{
 		{Name: "ge", Title: "Ge", Operator: ">=", Reversed: "le"},
 		{Name: "lt", Title: "Lt", Operator: "<", Reversed: "gt"},
 		{Name: "le", Title: "Le", Operator: "<=", Reversed: "ge"},
-		{Name: "eq", Title: "Eq", Operator: "==", Reversed: "eq"},
-		{Name: "ne", Title: "Ne", Operator: "!=", Reversed: "ne"},
+		{Name: "eq", Title: "Eq", Operator: "==", Reversed: "eq", FailReturn: "False"},
+		{Name: "ne", Title: "Ne", Operator: "!=", Reversed: "ne", FailReturn: "True"},
 	},
 }
 
@@ -79,7 +80,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to close %q: %v", filename, err)
 	}
-	err = exec.Command("gofmt", filename).Run()
+	err = exec.Command("go", "fmt", filename).Run()
 	if err != nil {
 		log.Fatalf("Failed to gofmt %q: %v", filename, err)
 	}
@@ -193,7 +194,7 @@ func {{.Title}}(a Object, b Object) (Object, error) {
 		}
 	}
 
-	return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for {{.Operator}}: '%s' and '%s'", a.Type().Name, b.Type().Name)
+	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 }}
 }
 {{ end }}
 `

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,7 @@ func Eq(a Object, b Object) (Object, error) {`
`863`	`863`	`}`
`864`	`864`	`}`
`865`	`865`
`866`		`- return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for ==: '%s' and '%s'", a.Type().Name, b.Type().Name)`
	`866`	`+ return False, nil`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`// Ne two python objects returning a boolean result`
`@@ -892,5 +892,5 @@ func Ne(a Object, b Object) (Object, error) {`
`892`	`892`	`}`
`893`	`893`	`}`
`894`	`894`
`895`		`- return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for !=: '%s' and '%s'", a.Type().Name, b.Type().Name)`
	`895`	`+ return True, nil`
`896`	`896`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ type Ops []struct {`
`22`	`22`	`NoInplace bool`
`23`	`23`	`Reversed string`
`24`	`24`	`Conversion string`
	`25`	`+ FailReturn string`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`type Data struct {`
`@@ -61,8 +62,8 @@ var data = Data{`
`61`	`62`	`{Name: "ge", Title: "Ge", Operator: ">=", Reversed: "le"},`
`62`	`63`	`{Name: "lt", Title: "Lt", Operator: "<", Reversed: "gt"},`
`63`	`64`	`{Name: "le", Title: "Le", Operator: "<=", Reversed: "ge"},`
`64`		`- {Name: "eq", Title: "Eq", Operator: "==", Reversed: "eq"},`
`65`		`- {Name: "ne", Title: "Ne", Operator: "!=", Reversed: "ne"},`
	`65`	`+ {Name: "eq", Title: "Eq", Operator: "==", Reversed: "eq", FailReturn: "False"},`
	`66`	`+ {Name: "ne", Title: "Ne", Operator: "!=", Reversed: "ne", FailReturn: "True"},`
`66`	`67`	`},`
`67`	`68`	`}`
`68`	`69`
`@@ -79,7 +80,7 @@ func main() {`
`79`	`80`	`if err != nil {`
`80`	`81`	`log.Fatalf("Failed to close %q: %v", filename, err)`
`81`	`82`	`}`
`82`		`- err = exec.Command("gofmt", filename).Run()`
	`83`	`+ err = exec.Command("go", "fmt", filename).Run()`
`83`	`84`	`if err != nil {`
`84`	`85`	`log.Fatalf("Failed to gofmt %q: %v", filename, err)`
`85`	`86`	`}`
`@@ -193,7 +194,7 @@ func {{.Title}}(a Object, b Object) (Object, error) {`
`193`	`194`	`}`
`194`	`195`	`}`
`195`	`196`
`196`		`- return nil, ExceptionNewf(TypeError, "unsupported operand type(s) for {{.Operator}}: '%s' and '%s'", a.Type().Name, b.Type().Name)`
	`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`	`198`	`}`
`198`	`199`	`{{ end }}`
`199`	`200`	`