Mercurial > octave

changeset 31934:c56866c949f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Rik <rik@octave.org>
date Sat, 25 Mar 2023 14:22:17 -0700
parents 40b77efa1c7b (current diff) c250c30c86a2 (diff)
children 3e01ed656bc5
files libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp libinterp/corefcn/gl-render.cc libinterp/corefcn/ls-hdf5.cc libinterp/corefcn/oct-map.cc libinterp/corefcn/stack-frame.h libinterp/dldfcn/__init_fltk__.cc libinterp/octave.cc liboctave/numeric/oct-rand.cc m4/acinclude.m4
diffstat 18 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/languages/build_ts/octave-qt/qfiledialog.cpp	Fri Mar 24 18:49:53 2023 -0400
+++ b/libgui/languages/build_ts/octave-qt/qfiledialog.cpp	Sat Mar 25 14:22:17 2023 -0700
@@ -2390,7 +2390,7 @@
     QActionGroup *showActionGroup = new QActionGroup(q);
     showActionGroup->setExclusive(false);
     QObject::connect(showActionGroup, SIGNAL(triggered(QAction*)),
-                     q, SLOT(_q_showHeader(QAction*)));;
+                     q, SLOT(_q_showHeader(QAction*)));
 
     QAbstractItemModel *abstractModel = model;
 #ifndef QT_NO_PROXYMODEL
--- a/libgui/languages/build_ts/octave-qt/qpagesetupdialog_win.cpp	Fri Mar 24 18:49:53 2023 -0400
+++ b/libgui/languages/build_ts/octave-qt/qpagesetupdialog_win.cpp	Sat Mar 25 14:22:17 2023 -0700
@@ -117,8 +117,8 @@
     QRect marginRect = ep->getPageMargins();
     psd.rtMargin.left   = marginRect.left()   / multiplier;
     psd.rtMargin.top    = marginRect.top()    / multiplier;
-    psd.rtMargin.right  = marginRect.width()  / multiplier;;
-    psd.rtMargin.bottom = marginRect.height() / multiplier;;
+    psd.rtMargin.right  = marginRect.width()  / multiplier;
+    psd.rtMargin.bottom = marginRect.height() / multiplier;
 
     bool result = PageSetupDlg(&psd);
     if (result) {
--- a/libgui/qterminal/libqterminal/unix/Filter.cpp	Fri Mar 24 18:49:53 2023 -0400
+++ b/libgui/qterminal/libqterminal/unix/Filter.cpp	Sat Mar 25 14:22:17 2023 -0700
@@ -614,7 +614,7 @@
     const UrlType kind = urlType();
 
     QAction* openAction = new QAction(_urlObject);
-    QAction* copyAction = new QAction(_urlObject);;
+    QAction* copyAction = new QAction(_urlObject);
 
     Q_ASSERT (kind == StandardUrl || kind == Email
                                   || kind == ErrorLink
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Mar 24 18:49:53 2023 -0400
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Sat Mar 25 14:22:17 2023 -0700
@@ -641,7 +641,7 @@
 
   int ascent = p.fontMetrics ().ascent ();
   int stride = m_consoleRect.width ();
-  int y = ascent + cy1 * ch;;
+  int y = ascent + cy1 * ch;
 
   for (int j = cy1; j <= cy2; j++, y += ch)
     {
@@ -797,7 +797,7 @@
   int ascent = p.fontMetrics ().ascent ();
   int stride = m_consoleRect.width ();
 
-  int y = ascent + cy1 * ch;;
+  int y = ascent + cy1 * ch;
   for (int j = cy1; j <= cy2; j++, y += ch)
     {
       int charsThisLine = 0;
@@ -904,7 +904,7 @@
   int ascent = p.fontMetrics ().ascent ();
   int stride = m_consoleRect.width ();
 
-  int y = ascent + cy1 * ch;;
+  int y = ascent + cy1 * ch;
   for (int j = cy1; j <= cy2; j++, y += ch)
     {
       // Reset string buffer and starting X coordinate
--- a/libinterp/corefcn/gl-render.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/corefcn/gl-render.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -573,7 +573,7 @@
             if (m_light_mode > 0)
               {
                 // edge lighting only uses ambient light
-                float buf[4] = { 0.0f, 0.0f, 0.0f, 1.0f };;
+                float buf[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
 
                 if (m_face_lighting)
                   for (int k = 0; k < 3; k++)
@@ -3381,7 +3381,7 @@
               m_glfcns.glColor4d (fcolor(0), fcolor(1), fcolor(2), fa);
               if (fl_mode > 0)
                 {
-                  float cb[4] = { 0.0f, 0.0f, 0.0f, 1.0f };;
+                  float cb[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
 
                   for (int i = 0; i < 3; i++)
                     cb[i] = as * fcolor(i);
--- a/libinterp/corefcn/ls-hdf5.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/corefcn/ls-hdf5.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -663,7 +663,7 @@
   hid_t type_class_id = -1;
   hid_t data_id = -1;
   hid_t subgroup_id = -1;
-  hid_t space_id = -1;;
+  hid_t space_id = -1;
 
   H5G_stat_t info;
   herr_t retval = 0;
--- a/libinterp/corefcn/ls-mat4.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/corefcn/ls-mat4.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -399,7 +399,7 @@
   mopt += tc.issparse () ? 2 : tc.is_string () ? 1 : 0;
 
   octave::mach_info::float_format flt_fmt
-    = octave::mach_info::native_float_format ();;
+    = octave::mach_info::native_float_format ();
 
   mopt += 1000 * float_format_to_mopt_digit (flt_fmt);
 
--- a/libinterp/corefcn/oct-map.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/corefcn/oct-map.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -1005,7 +1005,7 @@
         {
           // Use dummy array.  FIXME: Need(?) a better solution.
           Array<char> dummy (m_dimensions), rhs_dummy (rhs.m_dimensions);
-          dummy.assign (i, rhs_dummy);;
+          dummy.assign (i, rhs_dummy);
           m_dimensions = dummy.dims ();
         }
 
@@ -1053,7 +1053,7 @@
         {
           // Use dummy array.  FIXME: Need(?) a better solution.
           Array<char> dummy (m_dimensions), rhs_dummy (rhs.m_dimensions);
-          dummy.assign (i, j, rhs_dummy);;
+          dummy.assign (i, j, rhs_dummy);
           m_dimensions = dummy.dims ();
         }
 
@@ -1101,7 +1101,7 @@
         {
           // Use dummy array.  FIXME: Need(?) a better solution.
           Array<char> dummy (m_dimensions), rhs_dummy (rhs.m_dimensions);
-          dummy.assign (ia, rhs_dummy);;
+          dummy.assign (ia, rhs_dummy);
           m_dimensions = dummy.dims ();
         }
 
--- a/libinterp/corefcn/regexp.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/corefcn/regexp.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -1163,7 +1163,7 @@
 %! assert (b, {"foo bar foo"});
 %!test
 %! [a, b] = regexp (str, "fx.", "match", "split", "once");
-%! assert (a, "");;
+%! assert (a, "");
 %! assert (b, "foo bar foo");
 
 %!shared str
--- a/libinterp/corefcn/stack-frame.h	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/corefcn/stack-frame.h	Sat Mar 25 14:22:17 2023 -0700
@@ -427,7 +427,7 @@
 
   virtual void set_auto_fcn_var (auto_var_type, const octave_value&) = 0;
 
-  virtual octave_value varval (const symbol_record& sym) const = 0;;
+  virtual octave_value varval (const symbol_record& sym) const = 0;
 
   virtual octave_value varval (std::size_t data_offset) const;
 
--- a/libinterp/octave.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/libinterp/octave.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -134,7 +134,7 @@
 
         case BUILT_IN_DOCSTRINGS_FILE_OPTION:
           if (octave_optarg_wrapper ())
-            m_docstrings_file = octave_optarg_wrapper ();;
+            m_docstrings_file = octave_optarg_wrapper ();
           break;
 
         case DOC_CACHE_FILE_OPTION:
--- a/liboctave/numeric/lo-specfun.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/liboctave/numeric/lo-specfun.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -1073,7 +1073,7 @@
 
   if (alpha >= 0.0)
     {
-      FloatComplex y = 0.0;;
+      FloatComplex y = 0.0;
 
       F77_INT nz, t_ierr;
 
--- a/liboctave/numeric/oct-rand.cc	Fri Mar 24 18:49:53 2023 -0400
+++ b/liboctave/numeric/oct-rand.cc	Sat Mar 25 14:22:17 2023 -0700
@@ -609,7 +609,7 @@
 
 void rand::save_state ()
 {
-  m_rand_states[m_current_distribution] = get_internal_state ();;
+  m_rand_states[m_current_distribution] = get_internal_state ();
 }
 
 int rand::get_dist_id (const std::string& d)
--- a/m4/acinclude.m4	Fri Mar 24 18:49:53 2023 -0400
+++ b/m4/acinclude.m4	Sat Mar 25 14:22:17 2023 -0700
@@ -1306,7 +1306,7 @@
     [AC_LANG_PUSH(C++)
     AC_RUN_IFELSE([AC_LANG_PROGRAM([[
         #include <stdio.h>
-        #define PCRE2_CODE-uNIT_WIDTH 8
+        #define PCRE2_CODE_UNIT_WIDTH 8
         #if defined (HAVE_PCRE2_H)
         #  include <pcre2.h>
         #elif defined (HAVE_PCRE2_PCRE2_H)
--- a/scripts/pkg/private/installed_packages.m	Fri Mar 24 18:49:53 2023 -0400
+++ b/scripts/pkg/private/installed_packages.m	Sat Mar 25 14:22:17 2023 -0700
@@ -128,7 +128,7 @@
     endif
 
     h1 = postpad (h1, max_name_length + 1, " ");
-    h2 = postpad (h2, max_version_length, " ");;
+    h2 = postpad (h2, max_version_length, " ");
 
     ## Print a header.
     header = sprintf ("%s | %s | %s\n", h1, h2, h3);
--- a/scripts/plot/appearance/pbaspect.m	Fri Mar 24 18:49:53 2023 -0400
+++ b/scripts/plot/appearance/pbaspect.m	Sat Mar 25 14:22:17 2023 -0700
@@ -111,7 +111,7 @@
 
 %!demo
 %! clf;
-%! x = 0:0.01:4;;
+%! x = 0:0.01:4;
 %! plot (x,cos (x), x,sin (x));
 %! pbaspect ([2 1 1]);
 %! title ("plot box aspect ratio is 2x1");
--- a/test/index.tst	Fri Mar 24 18:49:53 2023 -0400
+++ b/test/index.tst	Sat Mar 25 14:22:17 2023 -0700
@@ -171,7 +171,7 @@
 %! assert (a, [1:4]);
 
 %!test
-%! a(:,:,1) = 1:4;;
+%! a(:,:,1) = 1:4;
 %! assert (a, [1:4]);
 
 %!test
@@ -191,7 +191,7 @@
 %! assert (a, [1:4]');
 
 %!test
-%! a(:,1,:) = reshape (1:4,[1,1,4]);;
+%! a(:,1,:) = reshape (1:4,[1,1,4]);
 %! assert (a, [1:4]');
 
 %!test
--- a/test/parser.tst	Fri Mar 24 18:49:53 2023 -0400
+++ b/test/parser.tst	Sat Mar 25 14:22:17 2023 -0700
@@ -105,7 +105,7 @@
 %! assert (a, 3);
 %! assert (a' ^2, 9);
 %! assert (2 ^sin (0), 1);
-%! assert (-2 ^2, -4);;
+%! assert (-2 ^2, -4);
 %! assert (2 ^+1 ^3, 8);
 %! assert (2 ^-1 ^3, 0.125);
 %! assert (2 ^~0 ^2, 4);