Преглед изворни кода

Move shorthand converter functions into seperate namespace

Billy Barrow пре 1 година
родитељ
комит
7767118007

+ 2 - 0
src/lib/Collections/BinaryData.vala

@@ -1,3 +1,5 @@
+using Invercargill.Convert;
+
 namespace Invercargill {
 
     public class BinaryData : Enumerable<uint8> {

+ 34 - 0
src/lib/Convert.vala

@@ -0,0 +1,34 @@
+namespace Invercargill.Convert {
+
+    public static Enumerable<T> ate<T>(T[] input) {
+        if(typeof(T).is_value_type()) {
+            // LibGee has already done the hard work around
+            // Vala's funkyness with arrays of type arguments
+            var gee = new Gee.ArrayList<T>.wrap(input);
+            return new GeeEnumerable<T>(gee);
+        }
+
+        return new ArrayEnumerable<T>(input);
+    }
+
+    public static Enumerable<T> gate<T>(GenericArray<T> input) {
+        return new GenericArrayEnumerable<T>(input);
+    }
+
+    public static Enumerable<T> gte<T>(Gee.Iterable<T> input) {
+        return new GeeEnumerable<T>(input);
+    }
+
+    public static BinaryData batbd(uint8[] input) {
+        return new BinaryData.from_byte_array(input);
+    }
+
+    public static BinaryData btbd(Bytes input) {
+        return new BinaryData.from_bytes(input);
+    }
+
+    public static BinaryData etbd(Enumerable<uint8> input) {
+        return new BinaryData.from_enumerable(input);
+    }
+
+}

+ 0 - 23
src/lib/Invercargill.vala

@@ -1,29 +1,6 @@
 
 namespace Invercargill {
 
-    public static Enumerable<T> ate<T>(T[] input) {
-        if(typeof(T).is_value_type()) {
-            // LibGee has already done the hard work around
-            // Vala's funkyness with arrays of type arguments
-            var gee = new Gee.ArrayList<T>.wrap(input);
-            return new GeeEnumerable<T>(gee);
-        }
-
-        return new ArrayEnumerable<T>(input);
-    }
-
-    public static Enumerable<T> gate<T>(GenericArray<T> input) {
-        return new GenericArrayEnumerable<T>(input);
-    }
-
-    public static Enumerable<T> gte<T>(Gee.Iterable<T> input) {
-        return new GeeEnumerable<T>(input);
-    }
-
-    //  public static Enumerable<string> dte(path input) {
-    //      return new DirEnumerable(input);
-    //  }
-
     public static Enumerable<int> range(int from, int to, int increment = 1) {
         return new RangeEnumerable(from, to, increment);
     }

+ 1 - 0
src/lib/meson.build

@@ -13,6 +13,7 @@ sources += files('Pair.vala')
 sources += files('Tracker.vala')
 sources += files('Errors.vala')
 sources += files('SelectionContext.vala')
+sources += files('Convert.vala')
 
 sources += files('Queries/Query.vala')
 sources += files('Queries/Transform.vala')

+ 1 - 0
src/tests/Integration/BinaryData.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void binary_data_tests() {
 

+ 1 - 0
src/tests/Integration/Firsts.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void first_tests() {
 

+ 1 - 0
src/tests/Integration/Gee.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void gee_tests() {
 

+ 1 - 0
src/tests/Integration/Parallel.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void parallel_tests() {
 

+ 1 - 0
src/tests/Integration/Select.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void select_tests() {
 

+ 1 - 0
src/tests/Integration/SelectMany.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void select_many_tests() {
 

+ 1 - 0
src/tests/Integration/Sort.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void sort_tests() {
 

+ 1 - 0
src/tests/Integration/Tracker.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void tracker_tests() {
 

+ 1 - 0
src/tests/Integration/Where.vala

@@ -1,4 +1,5 @@
 using Invercargill;
+using Invercargill.Convert;
 
 void where_tests() {