Mercurial > octave
changeset 21937:55f7de37b618
maint: Strip trailing whitespace from source files.
line wrap: on
line diff
--- a/libinterp/corefcn/jit-typeinfo.cc Fri Jun 17 09:11:40 2016 -0700 +++ b/libinterp/corefcn/jit-typeinfo.cc Fri Jun 17 05:52:21 2016 -0400 @@ -469,7 +469,7 @@ return ret; } - if (! (ovl.empty () + if (! (ovl.empty () || (ovl.length () == 1 && ovl.xelem (0).is_undefined ()))) err_bad_result ();
--- a/libinterp/corefcn/ls-mat5.cc Fri Jun 17 09:11:40 2016 -0700 +++ b/libinterp/corefcn/ls-mat5.cc Fri Jun 17 05:52:21 2016 -0400 @@ -1997,7 +1997,7 @@ // size = 2; // else if (max_val <= 2147483647L && min_val >= -2147483647L) // size = 4; - // + // // Round nel up to nearest even number of elements. // Take into account short tags for 4 byte elements.
--- a/libinterp/corefcn/syscalls.cc Fri Jun 17 09:11:40 2016 -0700 +++ b/libinterp/corefcn/syscalls.cc Fri Jun 17 05:52:21 2016 -0400 @@ -83,7 +83,7 @@ m.assign ("blksize", fs.blksize ()); else m.assign ("blksize", nan); - + if (have_blocks) m.assign ("blocks", fs.blocks ()); else
--- a/libinterp/dldfcn/__voronoi__.cc Fri Jun 17 09:11:40 2016 -0700 +++ b/libinterp/dldfcn/__voronoi__.cc Fri Jun 17 05:52:21 2016 -0400 @@ -334,7 +334,7 @@ #else octave_unused_parameter (args); - + std::string caller = (args.length () > 0 ? args(0).xstring_value ("__voronoi__: CALLER must be a string")
--- a/libinterp/dldfcn/symbfact.cc Fri Jun 17 09:11:40 2016 -0700 +++ b/libinterp/dldfcn/symbfact.cc Fri Jun 17 05:52:21 2016 -0400 @@ -380,7 +380,7 @@ octave_unused_parameter (args); octave_unused_parameter (nargout); - + err_disabled_feature ("symbfact", "CHOLMOD"); #endif
--- a/liboctave/numeric/lo-mappers.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/numeric/lo-mappers.h Fri Jun 17 05:52:21 2016 -0400 @@ -241,7 +241,7 @@ return isnan (x) ? octave::numeric_limits<float>::NaN () : tmp; } - + template <typename T> std::complex<T> signum (const std::complex<T>& x) @@ -550,7 +550,7 @@ inline double signum (double x) { return octave::math::signum (x); } OCTAVE_DEPRECATED ("use 'octave::math::signum' instead") inline float signum (float x) { return octave::math::signum (x); } - + template <typename T> OCTAVE_DEPRECATED ("use 'octave::math::signum' instead") std::complex<T> @@ -571,7 +571,7 @@ { return octave::math::trunc (x); } - + OCTAVE_DEPRECATED ("use 'octave::math::fix' instead") inline double fix (double x) { return octave::math::fix (x); } OCTAVE_DEPRECATED ("use 'octave::math::fix' instead") @@ -584,7 +584,7 @@ { return octave::math::fix (x); } - + OCTAVE_DEPRECATED ("use 'octave::math::floor' instead") inline double xfloor (double x) { return octave::math::floor (x); } OCTAVE_DEPRECATED ("use 'octave::math::floor' instead")
--- a/liboctave/system/oct-syscalls.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/system/oct-syscalls.h Fri Jun 17 05:52:21 2016 -0400 @@ -85,7 +85,7 @@ extern OCTAVE_API int wstopsig (int status); extern OCTAVE_API int wtermsig (int status); - + extern OCTAVE_API int wuntraced (void); extern OCTAVE_API int kill (pid_t, int);
--- a/liboctave/system/oct-time.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/system/oct-time.h Fri Jun 17 05:52:21 2016 -0400 @@ -445,7 +445,7 @@ } resource_usage (const resource_usage& ru) - : m_cpu (ru.m_cpu), m_maxrss (ru.m_maxrss), + : m_cpu (ru.m_cpu), m_maxrss (ru.m_maxrss), m_ixrss (ru.m_ixrss), m_idrss (ru.m_idrss), m_isrss (ru.m_isrss), m_minflt (ru.m_minflt), m_majflt (ru.m_majflt), m_nswap (ru.m_nswap),
--- a/liboctave/wrappers/dirent-wrappers.c Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/dirent-wrappers.c Fri Jun 17 05:52:21 2016 -0400 @@ -52,7 +52,7 @@ { rewinddir ((DIR *) dir); } - + int octave_closedir_wrapper (void *dir) {
--- a/liboctave/wrappers/dirent-wrappers.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/dirent-wrappers.h Fri Jun 17 05:52:21 2016 -0400 @@ -36,7 +36,7 @@ extern char *octave_readdir_wrapper (void *dir); extern void octave_rewinddir_wrapper (void *dir); - + extern int octave_closedir_wrapper (void *dir); extern unsigned int octave_name_max_wrapper (void);
--- a/liboctave/wrappers/fcntl-wrappers.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/fcntl-wrappers.h Fri Jun 17 05:52:21 2016 -0400 @@ -60,7 +60,7 @@ extern int octave_o_trunc_wrapper (void); extern int octave_o_wronly_wrapper (void); - + #if defined __cplusplus } #endif
--- a/liboctave/wrappers/glob-wrappers.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/glob-wrappers.h Fri Jun 17 05:52:21 2016 -0400 @@ -44,7 +44,7 @@ extern void octave_globfree_wrapper (void *glob_info); extern int octave_glob_nosort_wrapper (void); - + extern int octave_fnmatch_wrapper (const char *pattern, const char *name, int flags);
--- a/liboctave/wrappers/nproc-wrapper.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/nproc-wrapper.h Fri Jun 17 05:52:21 2016 -0400 @@ -33,7 +33,7 @@ OCTAVE_NPROC_CURRENT, OCTAVE_NPROC_CURRENT_OVERRIDABLE }; - + extern unsigned long int octave_num_processors_wrapper (enum octave_nproc_query);
--- a/liboctave/wrappers/stat-wrappers.c Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/stat-wrappers.c Fri Jun 17 05:52:21 2016 -0400 @@ -99,7 +99,7 @@ struct stat buf; int status = stat (fname, &buf); - + assign_stat_fields (&buf, mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime, rdev, blksize, blocks); @@ -116,7 +116,7 @@ struct stat buf; int status = lstat (lname, &buf); - + assign_stat_fields (&buf, mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime, rdev, blksize, blocks);
--- a/liboctave/wrappers/unistd-wrappers.c Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/unistd-wrappers.c Fri Jun 17 05:52:21 2016 -0400 @@ -215,7 +215,7 @@ { return STDOUT_FILENO; } - + int octave_symlink_wrapper (const char *nm1, const char *nm2) {
--- a/liboctave/wrappers/unistd-wrappers.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/unistd-wrappers.h Fri Jun 17 05:52:21 2016 -0400 @@ -84,7 +84,7 @@ extern int octave_stdin_fileno (void); extern int octave_stdout_fileno (void); - + extern int octave_symlink_wrapper (const char *nm1, const char *nm2); extern int octave_unlink_wrapper (const char *nm);
--- a/liboctave/wrappers/wait-wrappers.h Fri Jun 17 09:11:40 2016 -0700 +++ b/liboctave/wrappers/wait-wrappers.h Fri Jun 17 05:52:21 2016 -0400 @@ -50,7 +50,7 @@ extern int octave_wexitstatus_wrapper (int status); extern int octave_wnohang_wrapper (void); - + extern int octave_wstopsig_wrapper (int status); extern int octave_wtermsig_wrapper (int status);
--- a/scripts/general/inputParser.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/general/inputParser.m Fri Jun 17 05:52:21 2016 -0400 @@ -260,7 +260,7 @@ CaseSensitive = false; FunctionName = ""; KeepUnmatched = false; - PartialMatching = false; # FIXME: unimplemented (and default should be true) + PartialMatching = false; # FIXME: unimplemented (and default should be true) StructExpand = true; endproperties
--- a/scripts/gui/dialog.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/gui/dialog.m Fri Jun 17 05:52:21 2016 -0400 @@ -47,7 +47,7 @@ ## @item inverthardcopy ## off ## -## @item menubar +## @item menubar ## none ## ## @item numbertitle @@ -66,7 +66,7 @@ ## modal ## ## @end table -## +## ## ## Multiple property-value pairs may be specified for the dialog object, but ## they must appear in pairs. @@ -112,13 +112,14 @@ "paperpositionmode", "auto", ... "resize", "off", ... "toolbar", "none", ... - "visible", "on", + "visible", "on", "windowstyle", "modal", ... varargin{:} ); - + if (nargout > 0) h = tmph; - endif + endif + endfunction
--- a/scripts/miscellaneous/mkdir.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/miscellaneous/mkdir.m Fri Jun 17 05:52:21 2016 -0400 @@ -89,7 +89,7 @@ %! assert (status); %! assert (isdir (dir)); %! unwind_protect_cleanup -%! confirm_recursive_rmdir (false, "local"); +%! confirm_recursive_rmdir (false, "local"); %! rmdir (dir1, "s"); %! end_unwind_protect
--- a/scripts/optimization/fsolve.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/optimization/fsolve.m Fri Jun 17 05:52:21 2016 -0400 @@ -255,7 +255,7 @@ ## FIXME: Currently, pivoting is mostly useless because the \ operator ## cannot exploit the resulting props of the triangular factor. ## Unpivoted QR is significantly faster so it doesn't seem right to pivot - ## just to get invariance. Original MINPACK didn't pivot either, + ## just to get invariance. Original MINPACK didn't pivot either, ## at least when qr updating was used. [q, r] = qr (fjac, 0); endif
--- a/scripts/plot/appearance/legend.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/plot/appearance/legend.m Fri Jun 17 05:52:21 2016 -0400 @@ -799,7 +799,7 @@ hgkid_type = get (hgkid, "type"); if (any (strcmp (hgkid_type, {"line","patch","surface"}))) typ = hgkid_type; - hplt = hgkid; + hplt = hgkid; break; endif endfor
--- a/scripts/plot/appearance/text.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/plot/appearance/text.m Fri Jun 17 05:52:21 2016 -0400 @@ -303,7 +303,7 @@ %! h = text (0.5, 0.5, "factory"); %! assert (get (h, "string"), "factory"); %! -%! ## Test special null ("") string +%! ## Test special null ("") string %! h = text (0.5, 0.5, ""); %! assert (get (h, "string"), ""); %!
--- a/scripts/plot/draw/colorbar.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/plot/draw/colorbar.m Fri Jun 17 05:52:21 2016 -0400 @@ -316,7 +316,7 @@ set (hiax, "xlim", cext); endif endif - + endfunction function update_colorbar_cmap (hf, d, hi, vert, init_sz)
--- a/scripts/plot/draw/light.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/plot/draw/light.m Fri Jun 17 05:52:21 2016 -0400 @@ -42,7 +42,7 @@ ## their respective values: ## ## @table @asis -## @item @qcode{"Color":} The color of the light object can be passed as an +## @item @qcode{"Color":} The color of the light object can be passed as an ## RGB-vector (e.g. @qcode{[1 0 0]} for red) or as a string (e.g. @qcode{"r"} ## for red). The default color is white (@qcode{[1 1 1]}). ##
--- a/scripts/plot/util/axes.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/plot/util/axes.m Fri Jun 17 05:52:21 2016 -0400 @@ -105,7 +105,7 @@ hax = ch(axidx); ## Stack the legend associated with this axes on top of the axes itself hleg = hax(strcmp (get (hax, "tag"), "legend")); - if (any (hleg)) + if (any (hleg)) ## Get field "handle" from structure stored in "userdata" property if (isscalar (hleg)) hlegaxes = get (hleg, "userdata").handle; @@ -134,21 +134,21 @@ %! plot (10:-1:1, "r"); %! hleg2 = legend ("hax2"); %! -%! ch = allchild (hf); -%! hax = ch(isaxes (ch)); +%! ch = allchild (hf); +%! hax = ch(isaxes (ch)); %! assert (find (hax == hax2) < find (hax == hax1)); %! assert (find (hax == hleg1) < find (hax == hax1)); %! assert (find (hax == hleg2) < find (hax == hax2)); %! %! axes (hax1); -%! ch = allchild (hf); -%! hax = ch(isaxes (ch)); +%! ch = allchild (hf); +%! hax = ch(isaxes (ch)); %! assert (find (hax == hax2) > find (hax == hax1)); %! assert (find (hax == hleg1) < find (hax == hax1)); %! %! axes (hax2); -%! ch = allchild (hf); -%! hax = ch(isaxes (ch)); +%! ch = allchild (hf); +%! hax = ch(isaxes (ch)); %! assert (find (hax == hax2) < find (hax == hax1)); %! assert (find (hax == hleg2) < find (hax == hax2)); %! unwind_protect_cleanup
--- a/scripts/plot/util/ishghandle.m Fri Jun 17 09:11:40 2016 -0700 +++ b/scripts/plot/util/ishghandle.m Fri Jun 17 05:52:21 2016 -0400 @@ -32,14 +32,14 @@ if (nargin < 1 || nargin > 2) print_usage (); endif - + if (nargin == 2 && (! ischar (type) || ! isrow (type))) error ("ishghandle: TYPE must be a string"); endif - + ## Octave has no Simulink equivalent so it is sufficient to call ishandle. retval = ishandle (h); - + if (nargin == 2 && any (retval)) typematch = strcmpi (get (h(retval), "type"), type); retval(retval) = typematch;