Rework a couple of benchmarks to work with both Python2 and Python3 (swiftlang#32905)

tbkka · web-flow · commit 9bc5be372cde · 2020-07-15T15:16:14.000-07:00
diff --git a/benchmark/single-source/DropFirst.swift.gyb b/benchmark/single-source/DropFirst.swift.gyb
@@ -38,7 +38,7 @@ Sequences = [
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'array'),
 ]
-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')
+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
 Sequences = Sequences + map(lazy, Sequences)
 }%
diff --git a/benchmark/single-source/DropLast.swift.gyb b/benchmark/single-source/DropLast.swift.gyb
@@ -38,7 +38,7 @@ Sequences = [
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'array'),
 ]
-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')
+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
 Sequences = Sequences + map(lazy, Sequences)
 }%
diff --git a/benchmark/single-source/DropWhile.swift.gyb b/benchmark/single-source/DropWhile.swift.gyb
@@ -38,7 +38,7 @@ Sequences = [
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'array'),
 ]
-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')
+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
 Sequences = Sequences + map(lazy, Sequences)
 }%
diff --git a/benchmark/single-source/Prefix.swift.gyb b/benchmark/single-source/Prefix.swift.gyb
@@ -37,7 +37,7 @@ Sequences = [
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'array'),
 ]
-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')
+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
 Sequences = Sequences + map(lazy, Sequences)
 }%
diff --git a/benchmark/single-source/PrefixWhile.swift.gyb b/benchmark/single-source/PrefixWhile.swift.gyb
@@ -37,7 +37,7 @@ Sequences = [
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'array'),
 ]
-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')
+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
 Sequences = Sequences + map(lazy, Sequences)
 }%
diff --git a/benchmark/single-source/Suffix.swift.gyb b/benchmark/single-source/Suffix.swift.gyb
@@ -37,7 +37,7 @@ Sequences = [
   ('AnyCollection', 'AnyCollection(0..<sequenceCount)'),
   ('Array', 'array'),
 ]
-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')
+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')
 
 Sequences = Sequences + map(lazy, Sequences)
 }%

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ Sequences = [`
`38`	`38`	`('AnyCollection', 'AnyCollection(0..<sequenceCount)'),`
`39`	`39`	`('Array', 'array'),`
`40`	`40`	`]`
`41`		`-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')`
	`41`	`+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')`
`42`	`42`
`43`	`43`	`Sequences = Sequences + map(lazy, Sequences)`
`44`	`44`	`}%`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ Sequences = [`
`37`	`37`	`('AnyCollection', 'AnyCollection(0..<sequenceCount)'),`
`38`	`38`	`('Array', 'array'),`
`39`	`39`	`]`
`40`		`-def lazy ((Name, Expr)) : return (Name + 'Lazy', '(' + Expr + ').lazy')`
	`40`	`+def lazy (NameExpr) : return (NameExpr[0] + 'Lazy', '(' + NameExpr[1] + ').lazy')`
`41`	`41`
`42`	`42`	`Sequences = Sequences + map(lazy, Sequences)`
`43`	`43`	`}%`