chore: minor changes

albertodev01 · May 11, 2023 · e994c00 · e994c00
1 parent e68bb9b
commit e994c00
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 233 deletions.
diff --git a/example/bin/fraction_example.dart b/example/bin/fraction_example.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:fraction_example/fraction_example.dart';
 
-/// The app's main entrypoint.
+/// The application's main entrypoint.
 void main() {
   stdout.encoding = utf8;
 
@@ -38,7 +38,7 @@ void main() {
   }
 
   // To keep the console 'awake'. This is very useful on Windows!
-  stdout.write('Press return to exit...');
+  stdout.write('Press any key to exit...');
 
   // ignore: avoid-ignoring-return-values
   stdin.readLineSync();

diff --git a/example/lib/src/analyzer.dart b/example/lib/src/analyzer.dart
@@ -3,7 +3,7 @@ import 'package:fraction/fraction.dart';
 /// This base class is used to analyze an [input] string.
 ///
 /// The [analyze] method tries to convert [input] into a [Fraction] or
-/// [MixedFraction] object. It prints various properties of the fraction.
+/// [MixedFraction] object and prints various properties to the console.
 abstract base class RationalAnalyzer {
   /// The fraction or mixed fraction input.
   final String input;

diff --git a/example/lib/src/analyzer/analyzer.dart b/example/lib/src/analyzer/analyzer.dart
diff --git a/example/lib/src/analyzer/fraction_analyzer.dart b/example/lib/src/analyzer/fraction_analyzer.dart
diff --git a/example/lib/src/analyzer/mixed_fraction_analyzer.dart b/example/lib/src/analyzer/mixed_fraction_analyzer.dart
diff --git a/example/lib/src/console.dart b/example/lib/src/console.dart
diff --git a/example/lib/src/mixed_fraction_analyzer.dart b/example/lib/src/mixed_fraction_analyzer.dart
@@ -1,7 +1,7 @@
 import 'package:fraction/fraction.dart';
 import 'package:fraction_example/src/analyzer.dart';
 
-/// Tries to convert a [String] into a [MixedFraction]
+/// Tries to convert a [String] into a [MixedFraction].
 final class MixedFractionAnalyzer extends RationalAnalyzer {
   /// Creates a [MixedFractionAnalyzer] object.
   const MixedFractionAnalyzer({required String input}) : super(input);

diff --git a/example/test/analyzer/fraction_analyzer_test.dart b/example/test/analyzer/fraction_analyzer_test.dart
diff --git a/example/test/analyzer/mixed_fraction_analyzer_test.dart b/example/test/analyzer/mixed_fraction_analyzer_test.dart
diff --git a/lib/src/types/mixed.dart b/lib/src/types/mixed.dart
@@ -33,7 +33,7 @@ import 'package:fraction/src/types/egyptian_converter.dart';
 /// ```
 ///
 /// Operators always return new objects. There are extension methods on [num]
-/// and [String] that allow you to build [MixedFraction] objects "on the fly". 
+/// and [String] that allow you to build [MixedFraction] objects "on the fly".
 /// For example:
 ///
 /// ```dart
@@ -237,15 +237,7 @@ base class MixedFraction extends Rational {
   }
 
   @override
-  int get hashCode {
-    var result = 17;
-
-    result = result * 37 + whole.hashCode;
-    result = result * 37 + _numerator.hashCode;
-    result = result * 37 + _denominator.hashCode;
-
-    return result;
-  }
+  int get hashCode => Object.hash(whole, numerator, denominator);
 
   @override
   String toString() {

diff --git a/lib/src/types/standard.dart b/lib/src/types/standard.dart
@@ -306,14 +306,7 @@ base class Fraction extends Rational {
   }
 
   @override
-  int get hashCode {
-    var result = 17;
-
-    result = result * 37 + numerator.hashCode;
-    result = result * 37 + denominator.hashCode;
-
-    return result;
-  }
+  int get hashCode => Object.hash(numerator, denominator);
 
   @override
   String toString() {

diff --git a/test/types/mixed_test.dart b/test/types/mixed_test.dart
@@ -189,13 +189,17 @@ void main() {
           throwsA(isA<MixedFractionException>()),
         );
         expect(
-          () => MixedFraction.fromString('2  1/1'),
-          throwsA(isA<MixedFractionException>()),
+          () => MixedFraction.fromString('2 1/-1'),
+          throwsA(isA<FractionException>()),
         );
         expect(
           () => MixedFraction.fromString('2 c/0'),
           throwsA(isA<FractionException>()),
         );
+        expect(
+          () => MixedFraction.fromString('1 2/0'),
+          throwsA(isA<FractionException>()),
+        );
       },
     );
 

diff --git a/test/types/standard_test.dart b/test/types/standard_test.dart
@@ -94,7 +94,7 @@ void main() {
           throwsA(isA<FormatException>()),
         );
         expect(
-          () => Fraction.fromString('1/-3'),
+          () => Fraction.fromString('a/3'),
           throwsA(isA<FractionException>()),
         );
       },