oct: relative, proximate [skip ci]

Author: scivision

+stdlib/proximate_to.m

@@ -1,4 +1,4 @@
-%% PROXIMATE_TO relative path to base
+%% PROXIMATE_TO relative path to base (requires MEX)
 %
 %%% Inputs
 % * base (1,1) string
@@ -10,4 +10,4 @@
 
 function proximate_to(~,~)
 error("buildtool mex")
-end
+end

+stdlib/relative_to.m

@@ -1,4 +1,4 @@
-%% RELATIVE_TO relative path to base
+%% RELATIVE_TO relative path to base (requires MEX)
 %
 %%% Inputs
 % * base (1,1) string

octave_build.m

@@ -1,4 +1,6 @@
 % Build C++-based .oct file for GNU Octave
+function octave_build(overwrite)
+if nargin < 1, overwrite = false; end
 
 assert(stdlib.isoctave(), "for GNU Octave only")
 
@@ -13,6 +15,8 @@
 fullfile(d, "is_wsl.cpp"), ...
 fullfile(d, "is_rosetta.cpp"), ...
 fullfile(d, "is_admin.cpp"), ...
+fullfile(d, "proximate_to.cpp"), ...
+fullfile(d, "relative_to.cpp"), ...
 };
 
 
@@ -21,6 +25,10 @@
   src = s{1};
   [~, n] = fileparts(src);
 
+  if ~overwrite && isfile(fullfile(t, [n, ".oct"]))
+    continue
+  end
+
   disp(["mkoctfile: ", src, " => ", n, ".oct"])
   mkoctfile(src, ["-I", inc], "--output", fullfile(t, n))
 end

src/octave/drop_slash.cpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "os.cpp"
+#include "pure.cpp"
 #include "normalize.cpp"
 
 

src/octave/proximate_to.cpp

@@ -0,0 +1,25 @@
+#include <octave/oct.h>
+
+#include <string>
+#include <filesystem>
+#include <system_error>
+
+
+DEFUN_DLD (proximate_to, args, nargout,
+           "path proximate to base path")
+{
+  if (args.length() != 2){
+    octave_stdout << "Oct: Two inputs required\n";
+    return octave_value("");
+  }
+
+  std::error_code ec;
+
+  std::string out = std::filesystem::proximate(args(1).string_value(),
+                                             args(0).string_value(), ec).generic_string();
+
+  if(ec)
+    octave_stdout << ec.message() << "\n";
+
+  return octave_value(out);
+}

src/octave/relative_to.cpp

@@ -0,0 +1,25 @@
+#include <octave/oct.h>
+
+#include <string>
+#include <filesystem>
+#include <system_error>
+
+
+DEFUN_DLD (relative_to, args, nargout,
+           "path relative to base path")
+{
+  if (args.length() != 2){
+    octave_stdout << "Oct: Two inputs required\n";
+    return octave_value("");
+  }
+
+  std::error_code ec;
+
+  std::string out = std::filesystem::relative(args(1).string_value(),
+                                             args(0).string_value(), ec).generic_string();
+
+  if(ec)
+    octave_stdout << ec.message() << "\n";
+
+  return octave_value(out);
+}