Mercurial > octave

diff libinterp/corefcn/load-path.cc @ 20700:68e3a747ca02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename octave_value value extractors that accept error message args * ov.h, ov.cc (octave_value::xcell_value, octave_value::xstring_value, octave_value::xcellstr_value): Rename functions that accept error message args. Handle error directly. Only forward to functions that don't attempt type conversion. Change all uses. * ov-base.h, ov-base.cc (octave_base_value::xstring_value): Don't do type conversion. (octave_base_value::cell_value, octave_base_value::cellstr_value): Delete versions that accept error message args. * ov-str-mat.h, ov-str-mat.cc (octave_char_matrix_str::string_value, octave_char_matrix_str::cell_value): Delete.
author John W. Eaton <jwe@octave.org>
date Fri, 13 Nov 2015 14:10:26 -0500
parents fd0efcdb3718
children 571508c1ed06
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc	Thu Nov 12 19:27:25 2015 -0800
+++ b/libinterp/corefcn/load-path.cc	Fri Nov 13 14:10:26 2015 -0500
@@ -2239,18 +2239,18 @@
 
   if (nargin == 1)
     {
-      std::string dirname = args(0).string_value ("genpath: DIR must be a string");
+      std::string dirname = args(0).xstring_value ("genpath: DIR must be a string");
 
       retval = genpath (dirname);
     }
   else if (nargin > 1)
     {
-      std::string dirname = args(0).string_value ("genpath: all arguments must be strings");
+      std::string dirname = args(0).xstring_value ("genpath: all arguments must be strings");
 
       string_vector skip (nargin - 1);
 
       for (octave_idx_type i = 1; i < nargin; i++)
-        skip[i-1] = args(i).string_value ("genpath: all arguments must be strings");
+        skip[i-1] = args(i).xstring_value ("genpath: all arguments must be strings");
 
       retval = genpath (dirname, skip);
     }
@@ -2455,7 +2455,7 @@
 
       for (int i = 0; i < nargin; i++)
         {
-          std::string arg = args(i).string_value ("addpath: all arguments must be strings");
+          std::string arg = args(i).xstring_value ("addpath: all arguments must be strings");
 
           std::list<std::string> dir_elts = split_path (arg);
 
@@ -2519,7 +2519,7 @@
 
       for (int i = 0; i < nargin; i++)
         {
-          std::string arg = args(i).string_value ("rmpath: all arguments must be strings");
+          std::string arg = args(i).xstring_value ("rmpath: all arguments must be strings");
           std::list<std::string> dir_elts = split_path (arg);
 
           for (std::list<std::string>::const_iterator p = dir_elts.begin ();