소스 검색

Quick fix ups

Billy Barrow 1 주 전
부모
커밋
3a9ff792a3
4개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      src/lib/Composition.vala
  2. 3 3
      src/lib/Enumerable.vala
  3. 1 1
      src/lib/Errors.vala
  4. 2 2
      src/tests/Integration/EnumerableMethods.vala

+ 1 - 1
src/lib/Composition.vala

@@ -45,7 +45,7 @@ namespace Invercargill {
             enumerables.add_start (Iterate.single(item));
         }
 
-        public void apppend_item(T item) {
+        public void append_item(T item) {
             enumerables.add (Iterate.single(item));
         }
 

+ 3 - 3
src/lib/Enumerable.vala

@@ -102,7 +102,7 @@ namespace Invercargill {
             return count;
         }
 
-        public virtual ulong long_count(PredicateDelegate<T>? predicate = null) {
+        public virtual ulong count_ulong(PredicateDelegate<T>? predicate = null) {
             var enumerable = this;
             if(predicate != null) {
                 enumerable = this.where(predicate);
@@ -475,7 +475,7 @@ namespace Invercargill {
             if(tracker.has_next()) {
                 var item = tracker.get_next();
                 if(tracker.has_next()) {
-                    throw new SequenceError.MULTUPLE_ELEMENTS("The sequence contains more than one element");
+                    throw new SequenceError.MULTIPLE_ELEMENTS("The sequence contains more than one element");
                 }
                 return item;
             }
@@ -487,7 +487,7 @@ namespace Invercargill {
             if(tracker.has_next()) {
                 var item = tracker.get_next();
                 if(tracker.has_next()) {
-                    throw new SequenceError.MULTUPLE_ELEMENTS("The sequence contains more than one element");
+                    throw new SequenceError.MULTIPLE_ELEMENTS("The sequence contains more than one element");
                 }
                 return item;
             }

+ 1 - 1
src/lib/Errors.vala

@@ -12,7 +12,7 @@ namespace Invercargill {
 
     public errordomain SequenceError {
         NO_ELEMENTS,
-        MULTUPLE_ELEMENTS,
+        MULTIPLE_ELEMENTS,
         INVALID_TYPE,
         TOO_FEW_ELEMENTS,
     }

+ 2 - 2
src/tests/Integration/EnumerableMethods.vala

@@ -101,7 +101,7 @@ void enumerable_methods_tests() {
 
     Test.add_func("/invercargill/enumerable/long_count", () => {
         var items = range(0, 1000000);
-        assert(items.long_count() == 1000000);
+        assert(items.count_ulong() == 1000000);
     });
 
     Test.add_func("/invercargill/enumerable/distinct/simple", () => {
@@ -279,7 +279,7 @@ void enumerable_methods_tests() {
             items.single();
             assert_not_reached();
         } catch (SequenceError e) {
-            assert(e is SequenceError.MULTUPLE_ELEMENTS);
+            assert(e is SequenceError.MULTIPLE_ELEMENTS);
         }
     });