Merge pull request #182 from lexaknyazev/strong-mode

Strong mode and linter updates

Author: johnmccutchan

analysis_options.yaml

@@ -0,0 +1,4 @@
+analyzer:
+  strong-mode:
+    implicit-dynamic: False
+    implicit-casts: False

benchmark/matrix_bench.dart

@@ -19,6 +19,7 @@ class MatrixMultiplyBenchmark extends BenchmarkBase {
     new MatrixMultiplyBenchmark().report();
   }
 
+  @override
   void run() {
     for (int i = 0; i < 200; i++) {
       Matrix44Operations.multiply(C, 0, A, 0, B, 0);
@@ -36,6 +37,7 @@ class SIMDMatrixMultiplyBenchmark extends BenchmarkBase {
     new SIMDMatrixMultiplyBenchmark().report();
   }
 
+  @override
   void run() {
     for (int i = 0; i < 200; i++) {
       Matrix44SIMDOperations.multiply(C, 0, A, 0, B, 0);
@@ -53,6 +55,7 @@ class VectorTransformBenchmark extends BenchmarkBase {
     new VectorTransformBenchmark().report();
   }
 
+  @override
   void run() {
     for (int i = 0; i < 200; i++) {
       Matrix44Operations.transform4(C, 0, A, 0, B, 0);
@@ -70,6 +73,7 @@ class SIMDVectorTransformBenchmark extends BenchmarkBase {
     new SIMDVectorTransformBenchmark().report();
   }
 
+  @override
   void run() {
     for (int i = 0; i < 200; i++) {
       Matrix44SIMDOperations.transform4(C, 0, A, 0, B, 0);
@@ -89,14 +93,15 @@ class ViewMatrixBenchmark extends BenchmarkBase {
     new ViewMatrixBenchmark().report();
   }
 
+  @override
   void run() {
     for (int i = 0; i < 100; i++) {
       setViewMatrix(M, P, F, U);
     }
   }
 }
 
-main() {
+void main() {
   MatrixMultiplyBenchmark.main();
   SIMDMatrixMultiplyBenchmark.main();
   VectorTransformBenchmark.main();

bin/mesh_generator.dart

@@ -7,74 +7,70 @@ library vector_math.mesh_generator;
 import 'dart:convert';
 import 'package:vector_math/vector_math_geometry.dart';
 
+typedef MeshGeometry GenerateFunction(List<String> args);
+
 MeshGeometry generateCube(List<String> args) {
   if (args.length != 3) {
     return null;
   }
-  num width = double.parse(args[0]);
-  num height = double.parse(args[1]);
-  num depth = double.parse(args[2]);
-  var generator = new CubeGenerator();
-  MeshGeometry geometry = generator.createCube(width, height, depth);
-  return geometry;
+  final double width = double.parse(args[0]);
+  final double height = double.parse(args[1]);
+  final double depth = double.parse(args[2]);
+  final CubeGenerator generator = new CubeGenerator();
+  return generator.createCube(width, height, depth);
 }
 
 MeshGeometry generateSphere(List<String> args) {
   if (args.length != 1) {
     return null;
   }
-  num radius = double.parse(args[0]);
-  var generator = new SphereGenerator();
-  MeshGeometry geometry = generator.createSphere(radius);
-  return geometry;
+  final double radius = double.parse(args[0]);
+  final SphereGenerator generator = new SphereGenerator();
+  return generator.createSphere(radius);
 }
 
 MeshGeometry generateCircle(List<String> args) {
   if (args.length != 1) {
     return null;
   }
-  num radius = double.parse(args[0]);
-  var generator = new CircleGenerator();
-  MeshGeometry geometry = generator.createCircle(radius);
-  return geometry;
+  final double radius = double.parse(args[0]);
+  final CircleGenerator generator = new CircleGenerator();
+  return generator.createCircle(radius);
 }
 
 MeshGeometry generateCylinder(List<String> args) {
   if (args.length != 3) {
     return null;
   }
-  num topRadius = double.parse(args[0]);
-  num bottomRadius = double.parse(args[1]);
-  num height = double.parse(args[2]);
-  var generator = new CylinderGenerator();
-  MeshGeometry geometry =
-      generator.createCylinder(topRadius, bottomRadius, height);
-  return geometry;
+  final double topRadius = double.parse(args[0]);
+  final double bottomRadius = double.parse(args[1]);
+  final double height = double.parse(args[2]);
+  final CylinderGenerator generator = new CylinderGenerator();
+  return generator.createCylinder(topRadius, bottomRadius, height);
 }
 
 MeshGeometry generateRing(List<String> args) {
   if (args.length != 2) {
     return null;
   }
-  num innerRadius = double.parse(args[0]);
-  num outerRadius = double.parse(args[1]);
-  var generator = new RingGenerator();
-  MeshGeometry geometry = generator.createRing(innerRadius, outerRadius);
-  return geometry;
+  final double innerRadius = double.parse(args[0]);
+  final double outerRadius = double.parse(args[1]);
+  final RingGenerator generator = new RingGenerator();
+  return generator.createRing(innerRadius, outerRadius);
 }
 
-Map<String, Function> generators = {
+Map<String, GenerateFunction> generators = <String, GenerateFunction>{
   'cube': generateCube,
   'sphere': generateSphere,
   'circle': generateCircle,
   'cylinder': generateCylinder,
   'ring': generateRing
 };
 
-main(List<String> args_) {
-  List<String> args = new List.from(args_, growable: true);
+void main(List<String> args_) {
+  final List<String> args = new List<String>.from(args_, growable: true);
 
-  if (args.length == 0) {
+  if (args.isEmpty) {
     print('mesh_generator.dart <type> [<arg0> ... <argN>]');
     print('');
     print('<type> = cube, sphere, cylinder');
@@ -86,13 +82,13 @@ main(List<String> args_) {
     print('');
     return;
   }
-  var type = args.removeAt(0);
-  var generator = generators[type];
+  final String type = args.removeAt(0);
+  final GenerateFunction generator = generators[type];
   if (generator == null) {
     print('Could not find generator for $type');
     return;
   }
-  MeshGeometry geometry = generator(args);
+  final MeshGeometry geometry = generator(args);
   if (geometry == null) {
     print('Error generating geometry for $type');
     return;

lib/hash.dart

@@ -2,11 +2,11 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-/**
- * Generates a hash code for multiple [objects].
- */
-int hashObjects(Iterable objects) =>
-    _finish(objects.fold(0, (h, i) => _combine(h, i.hashCode)));
+///
+/// Generates a hash code for multiple [objects].
+///
+int hashObjects(Iterable<Object> objects) =>
+    _finish(objects.fold<int>(0, (int h, Object i) => _combine(h, i.hashCode)));
 
 // Jenkins hash functions
 int _combine(int hash, int value) {

lib/src/vector_math/aabb2.dart

@@ -78,8 +78,8 @@ class Aabb2 {
 
   /// Transform [this] by the transform [t].
   void transform(Matrix3 t) {
-    final center = new Vector2.zero();
-    final halfExtents = new Vector2.zero();
+    final Vector2 center = new Vector2.zero();
+    final Vector2 halfExtents = new Vector2.zero();
     copyCenterAndHalfExtents(center, halfExtents);
     t
       ..transform2(center)
@@ -94,8 +94,8 @@ class Aabb2 {
 
   /// Rotate [this] by the rotation matrix [t].
   void rotate(Matrix3 t) {
-    final center = new Vector2.zero();
-    final halfExtents = new Vector2.zero();
+    final Vector2 center = new Vector2.zero();
+    final Vector2 halfExtents = new Vector2.zero();
     copyCenterAndHalfExtents(center, halfExtents);
     t.absoluteRotate2(halfExtents);
     _min
@@ -133,8 +133,8 @@ class Aabb2 {
 
   /// Return if [this] contains [other].
   bool containsAabb2(Aabb2 other) {
-    final otherMax = other._max;
-    final otherMin = other._min;
+    final Vector2 otherMax = other._max;
+    final Vector2 otherMin = other._min;
 
     return (_min.x < otherMin.x) &&
         (_min.y < otherMin.y) &&
@@ -143,17 +143,16 @@ class Aabb2 {
   }
 
   /// Return if [this] contains [other].
-  bool containsVector2(Vector2 other) {
-    return (_min.x < other.x) &&
-        (_min.y < other.y) &&
-        (_max.x > other.x) &&
-        (_max.y > other.y);
-  }
+  bool containsVector2(Vector2 other) =>
+      (_min.x < other.x) &&
+      (_min.y < other.y) &&
+      (_max.x > other.x) &&
+      (_max.y > other.y);
 
   /// Return if [this] intersects with [other].
   bool intersectsWithAabb2(Aabb2 other) {
-    final otherMax = other._max;
-    final otherMin = other._min;
+    final Vector2 otherMax = other._max;
+    final Vector2 otherMin = other._min;
 
     return (_min.x <= otherMax.x) &&
         (_min.y <= otherMax.y) &&
@@ -162,10 +161,9 @@ class Aabb2 {
   }
 
   /// Return if [this] intersects with [other].
-  bool intersectsWithVector2(Vector2 other) {
-    return (_min.x <= other.x) &&
-        (_min.y <= other.y) &&
-        (_max.x >= other.x) &&
-        (_max.y >= other.y);
-  }
+  bool intersectsWithVector2(Vector2 other) =>
+      (_min.x <= other.x) &&
+      (_min.y <= other.y) &&
+      (_max.x >= other.x) &&
+      (_max.y >= other.y);
 }