Fix #36 - datenum compatibility extended. (in progress)

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `Resize` - Resize figure property.
+- [#36](http://github.com/nelson-lang/nelson/issues/36) `datenum` format compatibility extended.
 - [#37](http://github.com/nelson-lang/nelson/issues/37) `datestr` Convert date and time to string format.
 
 ### Changed

modules/time/CMakeLists.txt

@@ -41,7 +41,7 @@ target_include_directories(
 target_link_libraries(
   ${module_library_name}
   nlsCommons
-  nlsError
+  nlsError_manager
   nlsElementary_mathematics
   nlsI18n
   nlsInterpreter

modules/time/builtin/cpp/datestrBuiltin.cpp

@@ -19,12 +19,18 @@ Nelson::TimeGateway::datestrBuiltin(int nLhs, const ArrayOfVector& argIn)
 {
     nargincheck(argIn, 1, 3);
     nargoutcheck(nLhs, 0, 1);
-    ArrayOfVector retval(nLhs);
+    ArrayOfVector retval;
+
+    bool isValid = argIn[0].isDoubleType(true) && !argIn[0].isSparse() && argIn[0].is2D()
+        && argIn[0].isPositive();
 
-    bool isValid = argIn[0].isDoubleType(true) && !argIn[0].isSparse() && argIn[0].isPositive()
-        && argIn[0].is2D();
     if (!isValid) {
-        Error(_W("Numeric input data must be real."));
+        if (argIn[0].isStringArray() || argIn[0].isRowVectorCharacterArray()) {
+            std::wstring v = argIn[0].getContentAsWideString();
+            Error(v);
+        } else {
+            Error(_W("Numeric input data must be real."));
+        }
     }
 
     bool isLocalized = false;

modules/time/functions/@string/datestr.m

@@ -31,15 +31,17 @@
       varargout{1} = datestr(epochs, 'local');
     else
       % DateString = datestr(DateStringIn, formatOut)
-      epochs = datenum(dateStringIn, formatOutOrLocal);
-      varargout{1} = datestr(epochs);
+      try
+        epochs = datenum(dateStringIn);
+      catch
+        epochs = datenum(dateStringIn, formatOutOrLocal);
+      end
+      varargout{1} = datestr(epochs, formatOutOrLocal);
     end
     return
   end
   if nargin == 3
-    mustBeTextScalar(varargin{2}, 2);
     formatOut = convertStringsToChars(varargin{2});
-
     formatOutOrLocal = convertStringsToChars(varargin{3});
     if ischar(formatOutOrLocal)
       if ~strcmp(formatOutOrLocal, 'local')
@@ -50,7 +52,7 @@
       varargout{1} = datestr(epochs, formatOut, 'local');
     elseif (isnumeric(formatOutOrLocal) && isscalar(formatOutOrLocal))
       % DateString = datestr(DateStringIn, formatOut, PivotYear)
-      epochs = datenum(dateStringIn, formatOut, formatOutOrLocal);
+      epochs = datenum(dateStringIn, formatOutOrLocal);
       varargout{1} = datestr(epochs, formatOut);
     else
       error(_('Third argument must be a numeric scalar.'));