Mercurial > octave
changeset 22157:c5842206aaea
maint: Strip trailing whitespace from source files.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 22 Jul 2016 08:40:20 -0400 |
| parents | 187b6727c75e |
| children | 623b556e9d45 |
| files | libgui/src/octave-gui.cc libinterp/corefcn/interpreter.h liboctave/cruft/misc/f77-fcn.h liboctave/system/file-ops.h liboctave/util/oct-shlib.cc scripts/general/private/__publish_latex_output__.m scripts/general/publish.m scripts/general/validateattributes.m scripts/plot/appearance/lighting.m scripts/plot/draw/smooth3.m scripts/testfun/module.mk |
| diffstat | 11 files changed, 41 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc Thu Jul 21 18:11:06 2016 -0400 +++ b/libgui/src/octave-gui.cc Fri Jul 22 08:40:20 2016 -0400 @@ -67,7 +67,7 @@ #include <windows.h> // set app id if we have the SetCurrentProcessExplicitAppUserModelID // available (>= Win7) -static void +static void set_win_app_id () { typedef HRESULT (WINAPI *SETCURRENTAPPID)(PCWSTR AppID); @@ -75,7 +75,7 @@ if (hShell != NULL) { SETCURRENTAPPID pfnSetCurrentProcessExplicitAppUserModelID = - reinterpret_cast<SETCURRENTAPPID> (GetProcAddress (hShell, + reinterpret_cast<SETCURRENTAPPID> (GetProcAddress (hShell, "SetCurrentProcessExplicitAppUserModelID")); if (pfnSetCurrentProcessExplicitAppUserModelID)
--- a/libinterp/corefcn/interpreter.h Thu Jul 21 18:11:06 2016 -0400 +++ b/libinterp/corefcn/interpreter.h Fri Jul 22 08:40:20 2016 -0400 @@ -120,7 +120,7 @@ int main_loop (void); void clean_up_and_exit (int status, bool safe_to_return = false); - + application *m_app_context; bool m_embedded;
--- a/liboctave/cruft/misc/f77-fcn.h Thu Jul 21 18:11:06 2016 -0400 +++ b/liboctave/cruft/misc/f77-fcn.h Fri Jul 22 08:40:20 2016 -0400 @@ -222,7 +222,7 @@ } #undef OCTAVE_F77_FCN_INLINE - + #elif defined (F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION) /* Use these macros to pass character strings from C to Fortran.
--- a/liboctave/system/file-ops.h Thu Jul 21 18:11:06 2016 -0400 +++ b/liboctave/system/file-ops.h Fri Jul 22 08:40:20 2016 -0400 @@ -108,7 +108,7 @@ return (ipos != std::string::npos) ? path.substr (0, ipos) : ""; } - + // Return the tail member of a filename. static std::string tail (const std::string& path) {
--- a/liboctave/util/oct-shlib.cc Thu Jul 21 18:11:06 2016 -0400 +++ b/liboctave/util/oct-shlib.cc Fri Jul 22 08:40:20 2016 -0400 @@ -356,7 +356,7 @@ handle = LoadLibrary (file.c_str ()); set_dll_directory (); - + if (! handle) { DWORD lastError = GetLastError ();
--- a/scripts/general/private/__publish_latex_output__.m Thu Jul 21 18:11:06 2016 -0400 +++ b/scripts/general/private/__publish_latex_output__.m Fri Jul 22 08:40:20 2016 -0400 @@ -61,7 +61,7 @@ "{\\Huge\\section*{", escape_chars(title_str),"}}\n\n", ... "\\tableofcontents\n", ... "\\vspace*{4em}\n\n"]; - + outstr = [publish_comment, latex_preamble, listings_option, latex_head]; endfunction
--- a/scripts/general/publish.m Thu Jul 21 18:11:06 2016 -0400 +++ b/scripts/general/publish.m Fri Jul 22 08:40:20 2016 -0400 @@ -612,10 +612,10 @@ p_content{end+1}.type = "preformatted_code"; include_code = read_file_to_cellstr (strtrim ((fname{1}){1})); p_content{end}.content = strjoin (include_code, "\n"); - + continue; endif - + ## Graphic <<myGraphic.png>> if (! isempty ([~,~,~,~,fname] = regexpi (strjoin (block, ""), ... '^<<(.*)>>$')))
--- a/scripts/general/validateattributes.m Thu Jul 21 18:11:06 2016 -0400 +++ b/scripts/general/validateattributes.m Fri Jul 22 08:40:20 2016 -0400 @@ -552,181 +552,181 @@ %! end_try_catch %!test -%! try validateattributes (ones(3), {"numeric"}, {"vector"}); +%! try validateattributes (ones(3), {"numeric"}, {"vector"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-vector"); %! end_try_catch %!test -%! try validateattributes ([1 2], {"numeric"}, {"size", [1 1]}); +%! try validateattributes ([1 2], {"numeric"}, {"size", [1 1]}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:incorrect-size"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"numel", 7}); +%! try validateattributes (1, {"numeric"}, {"numel", 7}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:incorrect-numel"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"ncols", 7}); +%! try validateattributes (1, {"numeric"}, {"ncols", 7}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:incorrect-numcols"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"nrows", 7}); +%! try validateattributes (1, {"numeric"}, {"nrows", 7}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:incorrect-numrows"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"ndims", 5}); +%! try validateattributes (1, {"numeric"}, {"ndims", 5}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:incorrect-numdims"); %! end_try_catch %!test -%! try validateattributes ([1 2], {"numeric"}, {"square"}); +%! try validateattributes ([1 2], {"numeric"}, {"square"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-square"); %! end_try_catch %!test -%! try validateattributes ([1 2], {"numeric"}, {"diag"}); +%! try validateattributes ([1 2], {"numeric"}, {"diag"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-diag"); %! end_try_catch %!test -%! try validateattributes ([], {"numeric"}, {"nonempty"}); +%! try validateattributes ([], {"numeric"}, {"nonempty"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nonempty"); %! end_try_catch %!test -%! try validateattributes (speye(2), {"numeric"}, {"nonsparse"}); +%! try validateattributes (speye(2), {"numeric"}, {"nonsparse"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nonsparse"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {">", 3}); +%! try validateattributes (1, {"numeric"}, {">", 3}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-greater"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {">=", 3}); +%! try validateattributes (1, {"numeric"}, {">=", 3}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-greater-equal"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"<", -3}); +%! try validateattributes (1, {"numeric"}, {"<", -3}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-less"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"<=", -3}); +%! try validateattributes (1, {"numeric"}, {"<=", -3}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-less-equal"); %! end_try_catch %!test -%! try validateattributes (3, {"numeric"}, {"binary"}); +%! try validateattributes (3, {"numeric"}, {"binary"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-binary"); %! end_try_catch %!test -%! try validateattributes (1, {"numeric"}, {"even"}); +%! try validateattributes (1, {"numeric"}, {"even"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-even"); %! end_try_catch %!test -%! try validateattributes (2, {"numeric"}, {"odd"}); +%! try validateattributes (2, {"numeric"}, {"odd"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-odd"); %! end_try_catch %!test -%! try validateattributes (1.1, {"numeric"}, {"integer"}); +%! try validateattributes (1.1, {"numeric"}, {"integer"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-integer"); %! end_try_catch %!test -%! try validateattributes (1+1i*2, {"numeric"}, {"real"}); +%! try validateattributes (1+1i*2, {"numeric"}, {"real"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-real"); %! end_try_catch %!test -%! try validateattributes (Inf, {"numeric"}, {"finite"}); +%! try validateattributes (Inf, {"numeric"}, {"finite"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-finite"); %! end_try_catch %!test -%! try validateattributes (NaN, {"numeric"}, {"nonnan"}); +%! try validateattributes (NaN, {"numeric"}, {"nonnan"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nonnan"); %! end_try_catch %!test -%! try validateattributes (-1, {"numeric"}, {"nonnegative"}); +%! try validateattributes (-1, {"numeric"}, {"nonnegative"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nonnegative"); %! end_try_catch %!test -%! try validateattributes (0, {"numeric"}, {"nonzero"}); +%! try validateattributes (0, {"numeric"}, {"nonzero"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nonzero"); %! end_try_catch %!test -%! try validateattributes (-1, {"numeric"}, {"positive"}); +%! try validateattributes (-1, {"numeric"}, {"positive"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-positive"); %! end_try_catch %!test -%! try validateattributes ([1 2], {"numeric"}, {"decreasing"}); +%! try validateattributes ([1 2], {"numeric"}, {"decreasing"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-decreasing"); %! end_try_catch %!test -%! try validateattributes ([2 1], {"numeric"}, {"increasing"}); +%! try validateattributes ([2 1], {"numeric"}, {"increasing"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-increasing"); %! end_try_catch %!test -%! try validateattributes ([1 0], {"numeric"}, {"nondecreasing"}); +%! try validateattributes ([1 0], {"numeric"}, {"nondecreasing"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nondecreasing"); %! end_try_catch %!test -%! try validateattributes ([1 2], {"numeric"}, {"nonincreasing"}); +%! try validateattributes ([1 2], {"numeric"}, {"nonincreasing"}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:expected-nonincreasing"); %! end_try_catch %!test -%! try validateattributes (@sin, {"numeric"}, {}); +%! try validateattributes (@sin, {"numeric"}, {}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:invalid-type"); %! end_try_catch %!test -%! try validateattributes (@sin, 1, {}); +%! try validateattributes (@sin, 1, {}); %! catch id, %! assert (getfield (id, "identifier"), "Octave:invalid-type"); %! end_try_catch
--- a/scripts/plot/appearance/lighting.m Thu Jul 21 18:11:06 2016 -0400 +++ b/scripts/plot/appearance/lighting.m Fri Jul 22 08:40:20 2016 -0400 @@ -217,7 +217,6 @@ %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect -%! %!error lighting () %!error lighting (1, 2, "flat")
--- a/scripts/plot/draw/smooth3.m Thu Jul 21 18:11:06 2016 -0400 +++ b/scripts/plot/draw/smooth3.m Fri Jul 22 08:40:20 2016 -0400 @@ -90,7 +90,7 @@ if (! ischar (method)) error ("smooth3: METHOD must be a string"); endif - + if (! isreal (sz)) error ("smooth3: SZ must be a real scalar or 3-element vector"); elseif (isscalar (sz))
--- a/scripts/testfun/module.mk Thu Jul 21 18:11:06 2016 -0400 +++ b/scripts/testfun/module.mk Fri Jul 22 08:40:20 2016 -0400 @@ -4,7 +4,7 @@ scripts/testfun/private/compare_plot_demos.m \ scripts/testfun/private/dump_demos.m \ scripts/testfun/private/html_compare_plot_demos.m \ - scripts/testfun/private/html_plot_demos_template.html + scripts/testfun/private/html_plot_demos_template.html scripts_testfun_FCN_FILES = \ scripts/testfun/__have_feature__.m \