Change what was suggested in PR comments

nmcb · Dec 3, 2019 · 8635f1d · 8635f1d
1 parent 26b9899
commit 8635f1d
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 3 deletions.
diff --git a/bench-run/src/main/scala/Main.scala → ...n/scala/dotty/tools/benchmarks/Main.scala b/bench-run/src/main/scala/Main.scala → ...n/scala/dotty/tools/benchmarks/Main.scala
@@ -18,9 +18,12 @@ object Bench {
 
     val (intArgs, args1) = args.span(x => try { x.toInt; true } catch { case _: Throwable => false } )
 
-    val warmup = if (intArgs.length > 0) intArgs(0).toInt else 20
-    val iterations = if (intArgs.length > 1) intArgs(1).toInt else 20
-    val forks = if (intArgs.length > 2) intArgs(2).toInt else 1
+    def getIntArg(i: Int, default: Int): Int =
+      if (intArgs.length > i) intArgs(i).toInt else default
+
+    val warmup = getIntArg(0, 20)
+    val iterations = getIntArg(1, 20)
+    val forks = getIntArg(2, 1)
 
     if (args1.isEmpty) {
       println("Error: no benchmark was specified.")

diff --git a/bench-run/src/main/scala/tuples/Apply.scala → ...dotty/tools/benchmarks/tuples/Apply.scala b/bench-run/src/main/scala/tuples/Apply.scala → ...dotty/tools/benchmarks/tuples/Apply.scala
diff --git a/...-run/src/main/scala/tuples/ArrayOps.scala → ...ty/tools/benchmarks/tuples/ArrayOps.scala b/...-run/src/main/scala/tuples/ArrayOps.scala → ...ty/tools/benchmarks/tuples/ArrayOps.scala
diff --git a/bench-run/src/main/scala/tuples/Concat.scala → ...otty/tools/benchmarks/tuples/Concat.scala b/bench-run/src/main/scala/tuples/Concat.scala → ...otty/tools/benchmarks/tuples/Concat.scala
diff --git a/bench-run/src/main/scala/tuples/Cons.scala → .../dotty/tools/benchmarks/tuples/Cons.scala b/bench-run/src/main/scala/tuples/Cons.scala → .../dotty/tools/benchmarks/tuples/Cons.scala
diff --git a/bench-run/src/main/scala/tuples/Map.scala → ...a/dotty/tools/benchmarks/tuples/Map.scala b/bench-run/src/main/scala/tuples/Map.scala → ...a/dotty/tools/benchmarks/tuples/Map.scala
diff --git a/bench-run/src/main/scala/tuples/Tail.scala → .../dotty/tools/benchmarks/tuples/Tail.scala b/bench-run/src/main/scala/tuples/Tail.scala → .../dotty/tools/benchmarks/tuples/Tail.scala
diff --git a/...-run/src/main/scala/tuples/TupleOps.scala → ...ty/tools/benchmarks/tuples/TupleOps.scala b/...-run/src/main/scala/tuples/TupleOps.scala → ...ty/tools/benchmarks/tuples/TupleOps.scala
diff --git a/bench-run/src/main/scala/tuples/Zip.scala → ...a/dotty/tools/benchmarks/tuples/Zip.scala b/bench-run/src/main/scala/tuples/Zip.scala → ...a/dotty/tools/benchmarks/tuples/Zip.scala