cpu_arch: choose_method

Author: scivision

+stdlib/+native/cpu_arch.m

@@ -0,0 +1,5 @@
+function a = cpu_arch()
+
+a = string(computer('arch'));
+
+end

+stdlib/cpu_arch.m

@@ -1,14 +1,12 @@
 %% CPU_ARCH get the CPU architecture
 
-function a = cpu_arch()
-
-if stdlib.has_java()
-  a = stdlib.java.cpu_arch();
-elseif stdlib.has_dotnet()
-  a = stdlib.dotnet.cpu_arch();
-else
-  a = string(computer('arch'));
+function a = cpu_arch(method)
+arguments
+  method (1,:) string = ["java", "dotnet", "native"]
 end
 
-end
+fun = choose_method(method, "cpu_arch");
+
+a = fun();
 
+end

test/TestSys.m

@@ -7,7 +7,7 @@
 properties (TestParameter)
 fun = {@stdlib.isoctave, @stdlib.has_dotnet, ...
        @stdlib.has_java, @stdlib.has_python}
-cpu_arch_fun = {@stdlib.cpu_arch, @stdlib.dotnet.cpu_arch, @stdlib.java.cpu_arch}
+cpu_arch_fun = {'java', 'dotnet', 'native'}
 ia_fun = {'sys', 'dotnet', 'java', 'python'}
 cr_method = {'sys', 'java', 'python'}
 end
@@ -161,9 +161,13 @@ function test_xcode_version(tc)
 
 
 function test_cpu_arch(tc, cpu_arch_fun)
-is_capable(tc, cpu_arch_fun)
 
-arch = cpu_arch_fun();
+try
+  arch = stdlib.cpu_arch(cpu_arch_fun);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
 tc.verifyGreaterThan(strlength(arch), 0, "CPU architecture should not be empty")
 end
 
@@ -174,7 +178,7 @@ function test_ram_total(tc, ia_fun)
   tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
   return
 end
-  
+
 tc.verifyGreaterThan(t, 0)
 tc.verifyClass(t, 'uint64')
 end