Mercurial > octave

changeset 23396:945b53af4655

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Strip trailing whitespace from source files.
author John W. Eaton <jwe@octave.org>
date Thu, 13 Apr 2017 10:34:43 -0400
parents c14cf947142f
children 5970860bc70c
files doc/interpreter/genpropdoc.m libinterp/corefcn/gl-render.cc libinterp/corefcn/graphics.cc libinterp/corefcn/graphics.in.h libinterp/corefcn/interpreter.cc libinterp/corefcn/strfns.cc libinterp/parse-tree/oct-parse.in.yy libinterp/parse-tree/pt-idx.cc liboctave/array/dim-vector.h liboctave/wrappers/localcharset-wrapper.h scripts/+containers/Map.m scripts/gui/uicontrol.m scripts/gui/uipanel.m scripts/gui/uipushtool.m scripts/gui/uitoggletool.m scripts/gui/uitoolbar.m scripts/miscellaneous/dir.m scripts/plot/appearance/annotation.m scripts/sparse/ilu.m scripts/statistics/base/corrcoef.m scripts/testfun/test.m
diffstat 21 files changed, 59 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/genpropdoc.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/doc/interpreter/genpropdoc.m	Thu Apr 13 10:34:43 2017 -0400
@@ -120,7 +120,7 @@
   doc_fontunits = "Units used to interpret the @qcode{\"fontsize\"} property.";
   doc_fontweight = "Control the variant of the base font used for \
 text rendering.";
-  
+
   ## Initialize structure
   if (isfield (base, field))
     s = base.(field);
@@ -637,7 +637,7 @@
       case "dataaspectratiomode"
       case "fontangle"
         s.doc = doc_fontangle;
-        
+
       case "fontname"
         s.doc = doc_fontname;
         s.valid = valid_string;
@@ -654,7 +654,7 @@
 
       case "fontweight"
         s.doc = doc_fontweight;
-        
+
       case "gridalpha"
         s.doc = sprintf (doc_notimpl, "Transparency");
 
@@ -1026,7 +1026,7 @@
 
       case "fontangle"
         s.doc = doc_fontangle;
-        
+
       case "fontname"
         s.doc = doc_fontname;
         s.valid = valid_string;
@@ -1040,7 +1040,7 @@
 
       case "fontweight"
         s.doc = doc_fontweight;
-        
+
       case "horizontalalignment"
       case "interpreter"
         s.doc = "Control the way the @qcode{\"string\"} property is \
@@ -1436,7 +1436,7 @@
       case "borderwidth"
       case "fontangle"
         s.doc = doc_fontangle;
-        
+
       case "fontname"
         s.doc = doc_fontname;
         s.valid = valid_string;
@@ -1450,7 +1450,7 @@
 
       case "fontweight"
         s.doc = doc_fontweight;
-        
+
       case "foregroundcolor"
       case "highlightcolor"
       case "position"
@@ -1473,7 +1473,7 @@
       case "borderwidth"
       case "fontangle"
         s.doc = doc_fontangle;
-        
+
       case "fontname"
         s.doc = doc_fontname;
         s.valid = valid_string;
@@ -1487,7 +1487,7 @@
 
       case "fontweight"
         s.doc = doc_fontweight;
-        
+
       case "foregroundcolor"
       case "highlightcolor"
       case "position"
@@ -1514,7 +1514,7 @@
       case "extent"
       case "fontangle"
         s.doc = doc_fontangle;
-        
+
       case "fontname"
         s.doc = doc_fontname;
         s.valid = valid_string;
@@ -1528,7 +1528,7 @@
 
       case "fontweight"
         s.doc = doc_fontweight;
-        
+
       case "foregroundcolor"
       case "horizontalalignment"
       case "keypressfcn"
--- a/libinterp/corefcn/gl-render.cc	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/corefcn/gl-render.cc	Thu Apr 13 10:34:43 2017 -0400
@@ -1457,14 +1457,14 @@
               render_tickmarks (xmticks, x_min, x_max,
                                 is_origin ? y_axis_pos : ypTick, ypTick,
                                 zpTick, zpTickN, 0., 0.,
-                                (is_origin_low ? -1. : 1.) * 
+                                (is_origin_low ? -1. : 1.) *
                                 octave::math::signum (zpTick-zpTickN)*fz*xticklen/2,
                                 0, ! is_origin && mirror);
             else
               render_tickmarks (xmticks, x_min, x_max,
                                 is_origin ? y_axis_pos : ypTick, ypTickN,
                                 zpTick, zpTick, 0.,
-                                (is_origin_low ? -1. : 1.) * 
+                                (is_origin_low ? -1. : 1.) *
                                 octave::math::signum (ypTick-ypTickN)*fy*xticklen/2,
                                 0., 0, ! is_origin && mirror);
           }
@@ -1474,14 +1474,14 @@
           render_tickmarks (xticks, x_min, x_max,
                             is_origin ? y_axis_pos : ypTick, ypTick,
                             zpTick, zpTickN, 0., 0.,
-                            (is_origin_low ? -1. : 1.) * 
+                            (is_origin_low ? -1. : 1.) *
                             octave::math::signum (zpTick-zpTickN)*fz*xticklen,
                             0, ! is_origin && mirror);
         else
           render_tickmarks (xticks, x_min, x_max,
                             is_origin ? y_axis_pos : ypTick, ypTickN,
                             zpTick, zpTick, 0.,
-                            (is_origin_low ? -1. : 1.) * 
+                            (is_origin_low ? -1. : 1.) *
                             octave::math::signum (ypTick-ypTickN)*fy*xticklen,
                             0., 0, ! is_origin && mirror);
 
@@ -1497,7 +1497,7 @@
               render_ticktexts (xticks, xticklabels, x_min, x_max,
                                 is_origin ? y_axis_pos : ypTick,
                                 zpTick +
-                                (is_origin_low ? -1. : 1.) * 
+                                (is_origin_low ? -1. : 1.) *
                                 octave::math::signum (zpTick-zpTickN)*fz*xtickoffset,
                                 0, halign, valign, wmax, hmax);
             else
@@ -1637,14 +1637,14 @@
               render_tickmarks (ymticks, y_min, y_max,
                                 is_origin ? x_axis_pos : xpTick, xpTick,
                                 zpTick, zpTickN, 0., 0.,
-                                (is_origin_low ? -1. : 1.) * 
+                                (is_origin_low ? -1. : 1.) *
                                 octave::math::signum (zpTick-zpTickN)*fz*yticklen/2,
                                 1, ! is_origin && mirror);
             else
               render_tickmarks (ymticks, y_min, y_max,
                                 is_origin ? x_axis_pos : xpTick, xpTickN,
                                 zpTick, zpTick,
-                                (is_origin_low ? -1. : 1.) * 
+                                (is_origin_low ? -1. : 1.) *
                                 octave::math::signum (xpTick-xpTickN)*fx*yticklen/2,
                                 0., 0., 1, ! is_origin && mirror);
           }
@@ -1654,14 +1654,14 @@
           render_tickmarks (yticks, y_min, y_max,
                             is_origin ? x_axis_pos : xpTick, xpTick,
                             zpTick, zpTickN, 0., 0.,
-                            (is_origin_low ? -1. : 1.) * 
+                            (is_origin_low ? -1. : 1.) *
                             octave::math::signum (zpTick-zpTickN)*fz*yticklen,
                             1, ! is_origin && mirror);
         else
           render_tickmarks (yticks, y_min, y_max,
                             is_origin ? x_axis_pos : xpTick, xpTickN,
                             zpTick, zpTick,
-                            (is_origin_low ? -1. : 1.) * 
+                            (is_origin_low ? -1. : 1.) *
                             octave::math::signum (xPlaneN-xPlane)*fx*yticklen,
                             0., 0., 1, ! is_origin && mirror);
 
@@ -1677,7 +1677,7 @@
               render_ticktexts (yticks, yticklabels, y_min, y_max,
                                 is_origin ? x_axis_pos : xpTick,
                                 zpTick +
-                                (is_origin_low ? -1. : 1.) * 
+                                (is_origin_low ? -1. : 1.) *
                                 octave::math::signum (zpTick-zpTickN)*fz*ytickoffset,
                                 1, halign, valign, wmax, hmax);
             else
--- a/libinterp/corefcn/graphics.cc	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/corefcn/graphics.cc	Thu Apr 13 10:34:43 2017 -0400
@@ -5779,7 +5779,7 @@
       ypTick = yPlaneN;
       ypTickN = yPlane;
       Matrix xlimits = get_xlim ().matrix_value ();
-      if (yaxislocation_is ("right") || 
+      if (yaxislocation_is ("right") ||
           (xscale_is ("log") && yaxislocation_is ("origin")
            && (xlimits(1) < 0.)))
         {
--- a/libinterp/corefcn/graphics.in.h	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/corefcn/graphics.in.h	Thu Apr 13 10:34:43 2017 -0400
@@ -4775,9 +4775,9 @@
     void update_fontsize (void) { update_font (); update_text_extent (); }
     void update_fontangle (void) { update_font (); update_text_extent (); }
 
-    void update_fontweight (void) 
-    { 
-      update_font (); 
+    void update_fontweight (void)
+    {
+      update_font ();
       update_text_extent ();
       // FIXME: Remove warning with demi and light in 4.7+
       if (fontweight.is ("demi") || fontweight.is ("light"))
@@ -5782,9 +5782,9 @@
     void update_fontsize (void) { update_text_extent (); }
     void update_fontangle (void) { update_text_extent (); }
 
-    void update_fontweight (void) 
-    { 
-      update_text_extent (); 
+    void update_fontweight (void)
+    {
+      update_text_extent ();
       // FIXME: Remove warning with demi and light in 4.7+
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
@@ -5878,8 +5878,8 @@
     // void update_fontsize (void) { update_text_extent (); }
     // void update_fontangle (void) { update_text_extent (); }
 
-    void update_fontweight (void) 
-    { 
+    void update_fontweight (void)
+    {
       // FIXME: Remove this warning in 4.7+
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
@@ -5966,8 +5966,8 @@
     void update_units (const caseless_str& old_units);
     void update_fontunits (const caseless_str& old_units);
 
-    void update_fontweight (void) 
-    { 
+    void update_fontweight (void)
+    {
       // FIXME: Remove this warning in 4.7+
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
--- a/libinterp/corefcn/interpreter.cc	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/corefcn/interpreter.cc	Thu Apr 13 10:34:43 2017 -0400
@@ -678,7 +678,7 @@
 
         inhibit_startup_message = options.inhibit_startup_message ();
       }
-    
+
     if (m_interactive && ! inhibit_startup_message)
       std::cout << octave_startup_message () << "\n" << std::endl;
   }
--- a/libinterp/corefcn/strfns.cc	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/corefcn/strfns.cc	Thu Apr 13 10:34:43 2017 -0400
@@ -751,7 +751,7 @@
   std::string tmp = args(1).xstring_value ("CODEPAGE must be a string");
   const char *codepage
     = tmp.empty () ? octave_locale_charset_wrapper () : tmp.c_str ();
-  
+
   charNDArray native_bytes = args(0).char_array_value ();
 
   const char *src = native_bytes.data ();
--- a/libinterp/parse-tree/oct-parse.in.yy	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/parse-tree/oct-parse.in.yy	Thu Apr 13 10:34:43 2017 -0400
@@ -438,7 +438,7 @@
                 | fcn_list
                   { $$ = $1; }
                 ;
-                
+
 fcn_list        : fcn_list1 opt_sep
                   {
                     YYUSE ($2);
--- a/libinterp/parse-tree/pt-idx.cc	Thu Apr 13 10:32:21 2017 -0400
+++ b/libinterp/parse-tree/pt-idx.cc	Thu Apr 13 10:34:43 2017 -0400
@@ -385,7 +385,7 @@
             // the following code is definitely not correct in all
             // cases.  That it is already so complex makes me think that
             // there must be a better way.
-             
+
             bool split = ((type[i-1] == '(' && type[i] != '.')
                           || (al && al->has_magic_end ()
                               && ! tmp.is_classdef_object ()));
--- a/liboctave/array/dim-vector.h	Thu Apr 13 10:32:21 2017 -0400
+++ b/liboctave/array/dim-vector.h	Thu Apr 13 10:34:43 2017 -0400
@@ -214,7 +214,7 @@
   // Fast access with absolutely no checking
 
   octave_idx_type& xelem (int i) { return rep[i]; }
-    
+
   octave_idx_type xelem (int i) const { return rep[i]; }
 
   // Safe access to to elements
--- a/liboctave/wrappers/localcharset-wrapper.h	Thu Apr 13 10:32:21 2017 -0400
+++ b/liboctave/wrappers/localcharset-wrapper.h	Thu Apr 13 10:34:43 2017 -0400
@@ -28,7 +28,7 @@
 #endif
 
 extern const char *octave_locale_charset_wrapper (void);
-  
+
 #if defined __cplusplus
 }
 #endif
--- a/scripts/+containers/Map.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/+containers/Map.m	Thu Apr 13 10:34:43 2017 -0400
@@ -434,7 +434,7 @@
 
     function newobj = horzcat (varargin)
       warning ("Octave:language-extension",
-               "containers.Map: horizontal concatenation is an Octave-only feature");   
+               "containers.Map: horizontal concatenation is an Octave-only feature");
       newobj = vertcat (varargin{:});
     endfunction
 
@@ -515,7 +515,7 @@
       endswitch
 
       if (! any (strcmp (this.ValueType, {"any"; "char"; "logical";
-                                          "double"; "single"; 
+                                          "double"; "single";
                                           "int8"; "uint8"; "int16"; "uint16";
                                           "int32"; "uint32";
                                           "int64"; "uint64"})))
--- a/scripts/gui/uicontrol.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/gui/uicontrol.m	Thu Apr 13 10:34:43 2017 -0400
@@ -112,5 +112,5 @@
   if (nargout > 0)
     hui = htmp;
   endif
-  
+
 endfunction
--- a/scripts/gui/uipanel.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/gui/uipanel.m	Thu Apr 13 10:34:43 2017 -0400
@@ -62,7 +62,7 @@
   [h, args] = __uiobject_split_args__ ("uipanel", varargin,
                                        {"figure", "uipanel", "uibuttongroup"});
   htmp = __go_uipanel__ (h, args{:});
-  
+
   if (nargout > 0)
     hui = htmp;
   endif
--- a/scripts/gui/uipushtool.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/gui/uipushtool.m	Thu Apr 13 10:34:43 2017 -0400
@@ -74,9 +74,9 @@
       h = h(1);
     endif
   endif
-  
+
   htmp = __go_uipushtool__ (h, args{:});
-  
+
   if (nargout > 0)
     hui = htmp;
   endif
--- a/scripts/gui/uitoggletool.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/gui/uitoggletool.m	Thu Apr 13 10:34:43 2017 -0400
@@ -74,9 +74,9 @@
       h = h(1);
     endif
   endif
-  
+
   htmp = __go_uitoggletool__ (h, args{:});
-  
+
   if (nargout > 0)
     hui = htmp;
   endif
--- a/scripts/gui/uitoolbar.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/gui/uitoolbar.m	Thu Apr 13 10:34:43 2017 -0400
@@ -56,9 +56,9 @@
 function hui = uitoolbar (varargin)
 
   [h, args] = __uiobject_split_args__ ("uitoolbar", varargin, {"figure"});
-  
+
   htmp = __go_uitoolbar__ (h, args{:});
-  
+
   if (nargout > 0)
     hui = htmp;
   endif
--- a/scripts/miscellaneous/dir.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/miscellaneous/dir.m	Thu Apr 13 10:34:43 2017 -0400
@@ -32,7 +32,7 @@
 ##
 ## @item folder
 ## Location of file or directory
-## 
+##
 ## @item date
 ## Timestamp of file modification (string value).
 ##
--- a/scripts/plot/appearance/annotation.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/plot/appearance/annotation.m	Thu Apr 13 10:34:43 2017 -0400
@@ -1528,7 +1528,7 @@
 %!   assert (get (hpa, "edgecolor"), get (h, "color"));
 %!   assert (get (hpa, "facecolor"), [0 0 1]);
 %!   assert (get (hpa, "facealpha"), .6);
-%!  
+%!
 %!   assert (gca (), hax);
 %! unwind_protect_cleanup
 %!   close (hf);
--- a/scripts/sparse/ilu.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/sparse/ilu.m	Thu Apr 13 10:34:43 2017 -0400
@@ -461,7 +461,7 @@
 
 %!shared A
 %! A = sparse ([0 0 4 3 1; 5 1 2.3 2 4.5; 0 0 0 2 1;0 0 8 0 2.2; 0 0 9 9 1 ]);
-%! 
+%!
 %!test
 %! opts.udiag = 1;
 %! opts.type = "ilutp";
--- a/scripts/statistics/base/corrcoef.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/statistics/base/corrcoef.m	Thu Apr 13 10:34:43 2017 -0400
@@ -52,7 +52,7 @@
 ##
 ## @item @qcode{"rows"}
 ## Determine processing of NaN values.  Acceptable values are @qcode{"all"},
-## @qcode{"complete"}, and @qcode{"pairwise"}.  Default is @qcode{"all"}. 
+## @qcode{"complete"}, and @qcode{"pairwise"}.  Default is @qcode{"all"}.
 ## With @qcode{"complete"}, only the rows without NaN values are considered.
 ## With @qcode{"pairwise"}, the selection of NaN-free rows is made for each
 ## pair of variables.
@@ -73,7 +73,7 @@
 
   alpha = 0.05;
   rows = "all";
-  
+
   if (nargin > 1)
 
     ## Check for numeric y argument
@@ -97,7 +97,7 @@
       switch (tolower (parameter))
         case "alpha"
           if (isnumeric (value) && isscalar (value)
-              && value >= 0 && value <= 1) 
+              && value >= 0 && value <= 1)
             alpha = value;
           else
             error ('corrcoef: "alpha" must be a number between 0 and 1');
@@ -121,19 +121,19 @@
       endswitch
     endfor
   endif
-  
+
   if (strcmp (rows, "complete"))
     x(any (isnan (x), 2), :) = [];
   endif
-  
+
   if (isempty (x) || isscalar (x))
     r = p = lci = hci = NaN;
     return;
   endif
-  
+
   ## Flags for calculation
   pairwise = strcmp (rows, "pairwise");
-  calc_pval = nargout > 1; 
+  calc_pval = nargout > 1;
 
   if (isrow (x))
     x = x(:);
--- a/scripts/testfun/test.m	Thu Apr 13 10:32:21 2017 -0400
+++ b/scripts/testfun/test.m	Thu Apr 13 10:34:43 2017 -0400
@@ -557,7 +557,7 @@
         if (__idx)
           __runtime_feat_test = __feat_line(__idx+1:end);
           __feat_line = __feat_line(1:__idx-1);
-        else          
+        else
           __runtime_feat_test = "";
         endif
         __feat = regexp (__feat_line, '\w+', 'match');